2019-12-10 23:48:37 UTC

3976 files changed, 7952 insertions, 3983 deletions

diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.26.2 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.26.2
index e55ca3a9eecf..a4efb07d325d 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.26.2
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.26.2
@@ -7,7 +7,8 @@ IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.25.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-accessibility/at-spi2-core-2.25.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.26/at-spi2-atk-2.26.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=217e42996bf85d35f1c545694eb88154
+_md5_=917a25f0f8e69f4f74936c4ef7812a74
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.30.1 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.30.1
index 16089aee2cc8..1ebbdb3d486b 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.30.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.30.1
@@ -7,7 +7,8 @@ IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-accessibility/at-spi2-core-2.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.30/at-spi2-atk-2.30.1.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=01f07f1d22065066fd8aec2c41ce0660
+_md5_=dd8d53558181cc6644088c1a319763fa
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.32.0 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.32.0
index 082a782fcb55..e238745e0c48 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.32.0
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.32.0
@@ -8,7 +8,8 @@ IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 KEYWORDS=alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.31.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-accessibility/at-spi2-core-2.31.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.32/at-spi2-atk-2.32.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1dbc1801cd89ba4e9b5e9aac48fc00e1
+_md5_=ecd10f390e7133236ccd2204be611fc3
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.34.0 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.34.0
index 9608a327d7de..ca3c1c7fdc0d 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.34.0
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.34.0
@@ -8,7 +8,8 @@ IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.33.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-accessibility/at-spi2-core-2.33.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=052750cc098dec73c13448bac0c645dd
+_md5_=67c9e5152c24ad6251ada45325ea1fcb
diff --git a/metadata/md5-cache/app-admin/ansible-lint-3.4.23 b/metadata/md5-cache/app-admin/ansible-lint-3.4.23
index 84782dff126b..d9149cbaa950 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-3.4.23
+++ b/metadata/md5-cache/app-admin/ansible-lint-3.4.23
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=app-admin/ansible[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/willthames/ansible-lint/archive/v3.4.23.tar.gz -> ansible-lint-3.4.23.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3108d1e3f1a3c9b28175b260651caa35
+_md5_=78b3f1b72e2d44d04331067b333144f9
diff --git a/metadata/md5-cache/app-admin/ansible-lint-4.0.1 b/metadata/md5-cache/app-admin/ansible-lint-4.0.1
index 90454f77b771..ca54debf24e2 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-4.0.1
+++ b/metadata/md5-cache/app-admin/ansible-lint-4.0.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=app-admin/ansible[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ansible/ansible-lint/archive/v4.0.1.tar.gz -> ansible-lint-4.0.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=757fe1f3aa7a3b2f59eef25158ad0adf
+_md5_=09d2fcd50260f34e20cc881a22c10ea9
diff --git a/metadata/md5-cache/app-admin/conserver-8.2.3 b/metadata/md5-cache/app-admin/conserver-8.2.3
index a841132ccdd8..e6e21152b101 100644
--- a/metadata/md5-cache/app-admin/conserver-8.2.3
+++ b/metadata/md5-cache/app-admin/conserver-8.2.3
@@ -7,7 +7,8 @@ IUSE=debug ipv6 freeipmi kerberos libressl pam ssl test tcpd ssl
 KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD BSD-with-attribution
 RDEPEND=debug? ( dev-libs/dmalloc:= ) freeipmi? ( sys-libs/freeipmi:= ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) pam? ( sys-auth/pambase )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/conserver/conserver/releases/download/v8.2.3/conserver-8.2.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8c523a6de35e29eb3ae6032bf9883724
+_md5_=fe1c16daeacbf265badd92560c89813f
diff --git a/metadata/md5-cache/app-admin/conserver-8.2.4 b/metadata/md5-cache/app-admin/conserver-8.2.4
index 53f3af818609..e62d6b2f765a 100644
--- a/metadata/md5-cache/app-admin/conserver-8.2.4
+++ b/metadata/md5-cache/app-admin/conserver-8.2.4
@@ -7,7 +7,8 @@ IUSE=debug ipv6 freeipmi kerberos libressl pam ssl test tcpd ssl
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD BSD-with-attribution
 RDEPEND=debug? ( dev-libs/dmalloc:= ) freeipmi? ( sys-libs/freeipmi:= ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) pam? ( sys-auth/pambase )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/conserver/conserver/releases/download/v8.2.4/conserver-8.2.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7002daa918abbe7cffdc537d2d2c279a
+_md5_=1a8ebfc448e0fe31b11815f49866e495
diff --git a/metadata/md5-cache/app-admin/consul-replicate-0.2.0 b/metadata/md5-cache/app-admin/consul-replicate-0.2.0
index 7b9270180e70..9096792bbbb8 100644
--- a/metadata/md5-cache/app-admin/consul-replicate-0.2.0
+++ b/metadata/md5-cache/app-admin/consul-replicate-0.2.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/hashicorp/consul-replicate
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=MPL-2.0 Apache-2.0 BSD MIT
-RESTRICT=strip
+RESTRICT=strip !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul-replicate/archive/v0.2.0.tar.gz -> consul-replicate-0.2.0.tar.gz https://github.com/hashicorp/consul-template/archive/v0.8.0.tar.gz -> consul-template-0.8.0.tar.gz https://github.com/fatih/structs/archive/a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz -> structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892
-_md5_=5fab472446b283a863835462f56a2186
+_md5_=ca020f128cd9a3a842e37598103d6bdf
diff --git a/metadata/md5-cache/app-admin/diradm-2.9.7.1 b/metadata/md5-cache/app-admin/diradm-2.9.7.1
index ab55ce441d05..73d10a5a5d02 100644
--- a/metadata/md5-cache/app-admin/diradm-2.9.7.1
+++ b/metadata/md5-cache/app-admin/diradm-2.9.7.1
@@ -8,6 +8,7 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-nds/openldap-2.3 sys-apps/gawk sys-apps/coreutils sys-apps/grep dev-lang/perl app-shells/bash:* sys-apps/sed virtual/perl-MIME-Base64 samba? ( dev-perl/Crypt-SmbHash >=net-fs/samba-3.0.6 )
 REQUIRED_USE=test? ( automount irixpasswd samba )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://orbis-terrarum.net/~robbat2/diradm-2.9.7.1.tar.bz2
-_md5_=bd4ffa2c31ff5e62856d12c66d3291d4
+_md5_=77e9d3cabe2b709bf3a49ffa3b0f4ad4
diff --git a/metadata/md5-cache/app-admin/entr-4.3 b/metadata/md5-cache/app-admin/entr-4.3
index ab4b9b0802e6..a2c6d685373f 100644
--- a/metadata/md5-cache/app-admin/entr-4.3
+++ b/metadata/md5-cache/app-admin/entr-4.3
@@ -5,7 +5,8 @@ HOMEPAGE=http://entrproject.org
 IUSE=test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=ISC
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://entrproject.org/code/entr-4.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=01aab42d62f7db97347d4630f4d17fca
+_md5_=648ecfc9d2a52d13e0e107c4d06ac024
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.10.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.10.0
index a30e44aceb31..331b1ae4543e 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.10.0
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.10.0.tar.gz -> github-backup-utils-2.10.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3d0f7b04a7d34f14e52974b1bea5bf11
+_md5_=38663eddb2707bb39859b60e3ab9ceed
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.10.0-r1 b/metadata/md5-cache/app-admin/github-backup-utils-2.10.0-r1
index b6c7adc9e01e..e13411ea1c98 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.10.0-r1
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.10.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.10.0.tar.gz -> github-backup-utils-2.10.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0cdbb1e083eba12400e9dc7a6fc7c484
+_md5_=75253c3a3c1d26ae895b1ba4a9dbd03e
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.11.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.11.0
index a72f553ef197..dd785f65385a 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.11.0
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.11.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.11.0.tar.gz -> github-backup-utils-2.11.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3d0f7b04a7d34f14e52974b1bea5bf11
+_md5_=38663eddb2707bb39859b60e3ab9ceed
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.11.0-r1 b/metadata/md5-cache/app-admin/github-backup-utils-2.11.0-r1
index 42999fb5895a..2369bfe4d7e4 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.11.0-r1
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.11.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.11.0.tar.gz -> github-backup-utils-2.11.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0cdbb1e083eba12400e9dc7a6fc7c484
+_md5_=75253c3a3c1d26ae895b1ba4a9dbd03e
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.11.1 b/metadata/md5-cache/app-admin/github-backup-utils-2.11.1
index 1de70cc22aa6..5ff63ac3c4d0 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.11.1
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.11.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.11.1.tar.gz -> github-backup-utils-2.11.1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3d0f7b04a7d34f14e52974b1bea5bf11
+_md5_=38663eddb2707bb39859b60e3ab9ceed
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.11.1-r1 b/metadata/md5-cache/app-admin/github-backup-utils-2.11.1-r1
index 89579ad9be0b..b6fa7de9208d 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.11.1-r1
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.11.1-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.11.1.tar.gz -> github-backup-utils-2.11.1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0cdbb1e083eba12400e9dc7a6fc7c484
+_md5_=75253c3a3c1d26ae895b1ba4a9dbd03e
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.11.2 b/metadata/md5-cache/app-admin/github-backup-utils-2.11.2
index 5a94d102b9e2..45f392e5eced 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.11.2
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.11.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.11.2.tar.gz -> github-backup-utils-2.11.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3d0f7b04a7d34f14e52974b1bea5bf11
+_md5_=38663eddb2707bb39859b60e3ab9ceed
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.11.2-r1 b/metadata/md5-cache/app-admin/github-backup-utils-2.11.2-r1
index e23213f740f0..10c5aa4fee4e 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.11.2-r1
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.11.2-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.11.2.tar.gz -> github-backup-utils-2.11.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0cdbb1e083eba12400e9dc7a6fc7c484
+_md5_=75253c3a3c1d26ae895b1ba4a9dbd03e
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.13.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.13.0
index 8b21b8c8d8eb..3d597d331318 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.13.0
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.13.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.13.0.tar.gz -> github-backup-utils-2.13.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f2d554c9302fb1d58094d620446f0e5d
+_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.13.2 b/metadata/md5-cache/app-admin/github-backup-utils-2.13.2
index f461002eebdb..7c5888ed4f73 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.13.2
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.13.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.13.2.tar.gz -> github-backup-utils-2.13.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f2d554c9302fb1d58094d620446f0e5d
+_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.14.2 b/metadata/md5-cache/app-admin/github-backup-utils-2.14.2
index 468ca1581bca..cd0b9f32996e 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.14.2
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.14.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.14.2.tar.gz -> github-backup-utils-2.14.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f2d554c9302fb1d58094d620446f0e5d
+_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.15.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.15.0
index 7ac138f2cbd6..61fa4e44bd8f 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.15.0
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.15.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.15.0.tar.gz -> github-backup-utils-2.15.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0587f8a2365ec572ee5f4182495d1131
+_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.15.1 b/metadata/md5-cache/app-admin/github-backup-utils-2.15.1
index 9f9989c8d1f4..b14de6f0f00b 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.15.1
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.15.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.15.1.tar.gz -> github-backup-utils-2.15.1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0587f8a2365ec572ee5f4182495d1131
+_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.16.1 b/metadata/md5-cache/app-admin/github-backup-utils-2.16.1
index 232739754625..1f0229269f11 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.16.1
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.16.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.16.1.tar.gz -> github-backup-utils-2.16.1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7f50aaf775dbe23f869bf0be0870e107
+_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.17.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.17.0
index f40520e0f9ac..723f49409c8d 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.17.0
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.17.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.17.0.tar.gz -> github-backup-utils-2.17.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7f50aaf775dbe23f869bf0be0870e107
+_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.18.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.18.0
index 2848652a0ee3..269675d2545b 100644
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.18.0
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.18.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=net-misc/rsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/github/backup-utils/archive/v2.18.0.tar.gz -> github-backup-utils-2.18.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e59374d7a1ef931eb70a5fa10b9335d2
+_md5_=62f433eb36063decf506722bf1665476
diff --git a/metadata/md5-cache/app-admin/gixy-0.1.20 b/metadata/md5-cache/app-admin/gixy-0.1.20
index 59480bbb5479..3c4ae540c07d 100644
--- a/metadata/md5-cache/app-admin/gixy-0.1.20
+++ b/metadata/md5-cache/app-admin/gixy-0.1.20
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yandex/gixy/archive/v0.1.20.tar.gz -> gixy-0.1.20.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9768aef0bf0cc4b917769cb86d0f7071
+_md5_=bded26bcba313e217f13ca97b4c58edb
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.4.3-r1 b/metadata/md5-cache/app-admin/keepassxc-2.4.3-r1
index 19469c250591..3a56dc9ed3de 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.4.3-r1
+++ b/metadata/md5-cache/app-admin/keepassxc-2.4.3-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 GPL-2 GPL-3
 PDEPEND=x11-misc/xsel
 RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) keeshare? ( dev-libs/quazip ) yubikey? ( sys-auth/ykpers )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.4.3/keepassxc-2.4.3-src.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=447d790f7e294b63027d29d721124533
+_md5_=65701a59984994001080f022cda87b5e
diff --git a/metadata/md5-cache/app-admin/lastpass-cli-1.3.1-r1 b/metadata/md5-cache/app-admin/lastpass-cli-1.3.1-r1
index ea0316fd9ac9..a6434e8f2f27 100644
--- a/metadata/md5-cache/app-admin/lastpass-cli-1.3.1-r1
+++ b/metadata/md5-cache/app-admin/lastpass-cli-1.3.1-r1
@@ -7,7 +7,8 @@ IUSE=libressl X +pinentry test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ GPL-2+-with-openssl-exception
 RDEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lastpass/lastpass-cli/archive/v1.3.1.tar.gz -> lastpass-cli-1.3.1.tar.gz https://dev.gentoo.org/~gokturk/distfiles/app-admin/lastpass-cli/lastpass-cli-man-1.3.1.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1023b67d1ca885ec126009086615318a
+_md5_=29726429a9276a491d06391dd0f79297
diff --git a/metadata/md5-cache/app-admin/lastpass-cli-1.3.2 b/metadata/md5-cache/app-admin/lastpass-cli-1.3.2
index f3a5aa4a2141..2812a3239048 100644
--- a/metadata/md5-cache/app-admin/lastpass-cli-1.3.2
+++ b/metadata/md5-cache/app-admin/lastpass-cli-1.3.2
@@ -7,7 +7,8 @@ IUSE=libressl X +pinentry test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ GPL-2+-with-openssl-exception
 RDEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lastpass/lastpass-cli/archive/v1.3.2.tar.gz -> lastpass-cli-1.3.2.tar.gz https://dev.gentoo.org/~gokturk/distfiles/app-admin/lastpass-cli/lastpass-cli-man-1.3.1.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0019b0699a8e401ec3c9d70962d7aee3
+_md5_=6c426903c3707b12866eb075859a11cb
diff --git a/metadata/md5-cache/app-admin/lastpass-cli-1.3.3 b/metadata/md5-cache/app-admin/lastpass-cli-1.3.3
index 1602c26823ef..94772118a9cf 100644
--- a/metadata/md5-cache/app-admin/lastpass-cli-1.3.3
+++ b/metadata/md5-cache/app-admin/lastpass-cli-1.3.3
@@ -7,7 +7,8 @@ IUSE=libressl X +pinentry test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ GPL-2+-with-openssl-exception
 RDEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lastpass/lastpass-cli/archive/v1.3.3.tar.gz -> lastpass-cli-1.3.3.tar.gz https://dev.gentoo.org/~gokturk/distfiles/app-admin/lastpass-cli/lastpass-cli-man-1.3.1.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0019b0699a8e401ec3c9d70962d7aee3
+_md5_=6c426903c3707b12866eb075859a11cb
diff --git a/metadata/md5-cache/app-admin/lib_users-0.13 b/metadata/md5-cache/app-admin/lib_users-0.13
index 168ff2d4dc30..c3d19d90267d 100644
--- a/metadata/md5-cache/app-admin/lib_users-0.13
+++ b/metadata/md5-cache/app-admin/lib_users-0.13
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/klausman/lib_users/archive/v0.13.tar.gz -> lib_users-0.13.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6ec238b503d2c7cb3d17fc2acdac7028
+_md5_=416a8207dcdeef0e5c6eb617640acd4c
diff --git a/metadata/md5-cache/app-admin/packagekit-base-1.1.12 b/metadata/md5-cache/app-admin/packagekit-base-1.1.12
index 701ab2cc479e..9e509c42192a 100644
--- a/metadata/md5-cache/app-admin/packagekit-base-1.1.12
+++ b/metadata/md5-cache/app-admin/packagekit-base-1.1.12
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.54.0:2 >=sys-auth/polkit-0.114 >=sys-apps/dbus-1.3.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) systemd? ( >=sys-apps/systemd-213 ) >=app-portage/layman-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=sys-apps/portage-2.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] consolekit? ( sys-auth/consolekit ) entropy? ( >=sys-apps/entropy-234[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( consolekit elogind systemd ) vala? ( introspection ) entropy? ( python_single_target_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.12.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a1d21ad3136aa5a5743ed13b40f6860
+_md5_=2c3e791050f55ec87612b80466e28257
diff --git a/metadata/md5-cache/app-admin/pass-otp-1.2.0 b/metadata/md5-cache/app-admin/pass-otp-1.2.0
index 0ec35dfdbc3e..176c81a9f80e 100644
--- a/metadata/md5-cache/app-admin/pass-otp-1.2.0
+++ b/metadata/md5-cache/app-admin/pass-otp-1.2.0
@@ -7,7 +7,8 @@ IUSE=qrcode test
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=app-admin/pass-1.7 sys-auth/oath-toolkit qrcode? ( media-gfx/qrencode )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tadfisher/pass-otp/releases/download/v1.2.0/pass-otp-1.2.0.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=380cafb5223cc50f50a7bb61063adebf
+_md5_=a18f64075a8d5c6abeca3d6ab88c4f1e
diff --git a/metadata/md5-cache/app-admin/passwordsafe-1.08_beta b/metadata/md5-cache/app-admin/passwordsafe-1.08_beta
index 04ec7e5e5d82..e65803bcc2dd 100644
--- a/metadata/md5-cache/app-admin/passwordsafe-1.08_beta
+++ b/metadata/md5-cache/app-admin/passwordsafe-1.08_beta
@@ -7,7 +7,8 @@ IUSE=libressl minimal test qr yubikey +xml xvkbd
 KEYWORDS=~amd64
 LICENSE=Artistic-2
 RDEPEND=xml? ( dev-libs/xerces-c ) qr? ( media-gfx/qrencode ) net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux x11-libs/libXt x11-libs/libXtst x11-libs/wxGTK:3.0-gtk3[X] !minimal? ( !!app-misc/pwsafe ) yubikey? ( sys-auth/ykpers ) xvkbd? ( x11-misc/xvkbd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwsafe/pwsafe/archive/1.08BETA.tar.gz -> passwordsafe-1.08_beta.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24863fd6f8e7313799f812d04bd5a0a2
+_md5_=500a97dfb2361583a4eaf2c07541baa9
diff --git a/metadata/md5-cache/app-admin/pwman3-0.10.0 b/metadata/md5-cache/app-admin/pwman3-0.10.0
index 2b6c9eb4e6ed..2d8ab109ed3c 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.10.0
+++ b/metadata/md5-cache/app-admin/pwman3-0.10.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=>=dev-python/cryptography-2.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/colorama-0.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] mongodb? ( dev-python/pymongo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/pymysql[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( dev-python/psycopg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwman3/pwman3/archive/v0.10.0.tar.gz -> pwman3-0.10.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ec468fea2cf1b783513e377ffafcb6b3
+_md5_=7ce1731c4fc6fb8f8ea4fc90ed33b36a
diff --git a/metadata/md5-cache/app-admin/pwman3-0.9.11 b/metadata/md5-cache/app-admin/pwman3-0.9.11
index dd83b236ef6b..ba20982aef86 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.9.11
+++ b/metadata/md5-cache/app-admin/pwman3-0.9.11
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-python/cryptography-2.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/colorama-0.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] mongodb? ( dev-python/pymongo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/pymysql[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( dev-python/psycopg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwman3/pwman3/archive/v0.9.11.tar.gz -> pwman3-0.9.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f2105d3c4df1fc3b9fff510d3ee0632
+_md5_=115301190bf46926289c8ffbce1101fc
diff --git a/metadata/md5-cache/app-admin/rcm-1.3.1 b/metadata/md5-cache/app-admin/rcm-1.3.1
index 4331bdf40a84..da83f5168222 100644
--- a/metadata/md5-cache/app-admin/rcm-1.3.1
+++ b/metadata/md5-cache/app-admin/rcm-1.3.1
@@ -6,6 +6,7 @@ HOMEPAGE=https://github.com/thoughtbot/rcm
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://thoughtbot.github.io/rcm/dist/rcm-1.3.1.tar.gz
-_md5_=a74aa869a1cc5d020ff480ebffb27581
+_md5_=cf82b5a4e19a07f638fbfc6c120be063
diff --git a/metadata/md5-cache/app-admin/rcm-1.3.3 b/metadata/md5-cache/app-admin/rcm-1.3.3
index d12e1b0bfb1e..4297aaba4a86 100644
--- a/metadata/md5-cache/app-admin/rcm-1.3.3
+++ b/metadata/md5-cache/app-admin/rcm-1.3.3
@@ -6,6 +6,7 @@ HOMEPAGE=https://github.com/thoughtbot/rcm
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://thoughtbot.github.io/rcm/dist/rcm-1.3.3.tar.gz
-_md5_=a74aa869a1cc5d020ff480ebffb27581
+_md5_=cf82b5a4e19a07f638fbfc6c120be063
diff --git a/metadata/md5-cache/app-admin/rex-1.3.3 b/metadata/md5-cache/app-admin/rex-1.3.3
index 9e91bac4a41b..f0624d8ce60f 100644
--- a/metadata/md5-cache/app-admin/rex-1.3.3
+++ b/metadata/md5-cache/app-admin/rex-1.3.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERKI/Rex-1.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0643541b8039fff52cb9fc89a885a68c
+_md5_=556430ef0c67ef7da004f9e089ebb8ac
diff --git a/metadata/md5-cache/app-admin/rex-1.4.0-r1 b/metadata/md5-cache/app-admin/rex-1.4.0-r1
index 3fa62cf9cfa8..c540640ef372 100644
--- a/metadata/md5-cache/app-admin/rex-1.4.0-r1
+++ b/metadata/md5-cache/app-admin/rex-1.4.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERKI/Rex-1.4.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=14164613f98e4a303e2340e5278d77c4
+_md5_=b83b75bac124b68805e2f7d2d57a9ed6
diff --git a/metadata/md5-cache/app-admin/rex-1.4.1 b/metadata/md5-cache/app-admin/rex-1.4.1
index 039f3ba978e1..4e1611bc811f 100644
--- a/metadata/md5-cache/app-admin/rex-1.4.1
+++ b/metadata/md5-cache/app-admin/rex-1.4.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JF/JFRIED/Rex-1.4.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bae67bc70ad4804119a8af9e982d071c
+_md5_=726a3a7f4e9d96f0f3c575c00cfba682
diff --git a/metadata/md5-cache/app-admin/rex-1.5.0 b/metadata/md5-cache/app-admin/rex-1.5.0
index f357b8c4a6dd..dc5cfa39873d 100644
--- a/metadata/md5-cache/app-admin/rex-1.5.0
+++ b/metadata/md5-cache/app-admin/rex-1.5.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JF/JFRIED/Rex-1.5.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=91de31a3751359471f668ed92cfc6b07
+_md5_=54524d8d1772afdaa711d4e5b7743131
diff --git a/metadata/md5-cache/app-admin/rex-1.6.0 b/metadata/md5-cache/app-admin/rex-1.6.0
index b766dc27dc08..4221c360deca 100644
--- a/metadata/md5-cache/app-admin/rex-1.6.0
+++ b/metadata/md5-cache/app-admin/rex-1.6.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JF/JFRIED/Rex-1.6.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bd2809e2eba7eae36bc20d59b7a53cba
+_md5_=29406043b07c7f8bd862317a2be66191
diff --git a/metadata/md5-cache/app-admin/rex-9999 b/metadata/md5-cache/app-admin/rex-9999
index 9260fb139126..48634b573ecf 100644
--- a/metadata/md5-cache/app-admin/rex-9999
+++ b/metadata/md5-cache/app-admin/rex-9999
@@ -7,6 +7,7 @@ IUSE=test
 LICENSE=|| ( Artistic GPL-1+ )
 PROPERTIES=live
 RDEPEND=dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=91de31a3751359471f668ed92cfc6b07
+_md5_=54524d8d1772afdaa711d4e5b7743131
diff --git a/metadata/md5-cache/app-admin/setools-4.2.1 b/metadata/md5-cache/app-admin/setools-4.2.1
index 897e8df4f68b..2ad4297cf8e3 100644
--- a/metadata/md5-cache/app-admin/setools-4.2.1
+++ b/metadata/md5-cache/app-admin/setools-4.2.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/networkx-2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-libs/libsepol-2.8:= >=sys-libs/libselinux-2.8:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/setools/archive/4.2.1.tar.gz -> setools-4.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=855fe0294835ce74e5e68e94ba5ccf14
+_md5_=0ff4451bdd764259c0408e99e9bf27ba
diff --git a/metadata/md5-cache/app-admin/stow-2.2.2-r1 b/metadata/md5-cache/app-admin/stow-2.2.2-r1
index a814db73fba4..97bbd7f0ed69 100644
--- a/metadata/md5-cache/app-admin/stow-2.2.2-r1
+++ b/metadata/md5-cache/app-admin/stow-2.2.2-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/stow/stow-2.2.2.tar.gz
 _eclasses_=perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b
-_md5_=769be0ad376d08f837f8057db2ff0927
+_md5_=f5825506716fca00644ba64353f91a1b
diff --git a/metadata/md5-cache/app-admin/stow-2.3.1 b/metadata/md5-cache/app-admin/stow-2.3.1
index fb7e3921b532..a8fde11d2c37 100644
--- a/metadata/md5-cache/app-admin/stow-2.3.1
+++ b/metadata/md5-cache/app-admin/stow-2.3.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/stow/stow-2.3.1.tar.gz
 _eclasses_=perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b
-_md5_=9695f5d30d8170a3a6269ea995666424
+_md5_=4883f972b06c3b71afe4c15c4af10f7b
diff --git a/metadata/md5-cache/app-admin/supernova-2.2.0 b/metadata/md5-cache/app-admin/supernova-2.2.0
index c44ca71c7a39..c0f6658138b8 100644
--- a/metadata/md5-cache/app-admin/supernova-2.2.0
+++ b/metadata/md5-cache/app-admin/supernova-2.2.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/click[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keyring-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-novaclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rackspace-novaclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supernova/supernova-2.2.0.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a0fed80102c023a48ecde35de3412bb
+_md5_=64a07fd7ea230a9edecf49c9d06404f3
diff --git a/metadata/md5-cache/app-admin/supervisor-3.1.4 b/metadata/md5-cache/app-admin/supervisor-3.1.4
index f7c168a3738c..c4ae547f3c97 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.1.4
+++ b/metadata/md5-cache/app-admin/supervisor-3.1.4
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=repoze ZPL BSD HPND GPL-2
 RDEPEND=dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.1.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5eea46651bf2bb0755e94b1ffa74456c
+_md5_=35dd94f879a06c12933f6f3ebff8d679
diff --git a/metadata/md5-cache/app-admin/supervisor-3.3.5 b/metadata/md5-cache/app-admin/supervisor-3.3.5
index e1278839920a..45b099d62a30 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.3.5
+++ b/metadata/md5-cache/app-admin/supervisor-3.3.5
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=repoze ZPL BSD HPND GPL-2
 RDEPEND=dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.3.5.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=f435a57824ca9a40cf8b63c0848e2883
+_md5_=b2ec38658e46eb0f3faa0aa72d538411
diff --git a/metadata/md5-cache/app-admin/supervisor-4.0.3 b/metadata/md5-cache/app-admin/supervisor-4.0.3
index b210a830eb58..a7d60b496059 100644
--- a/metadata/md5-cache/app-admin/supervisor-4.0.3
+++ b/metadata/md5-cache/app-admin/supervisor-4.0.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=repoze ZPL BSD HPND GPL-2
 RDEPEND=>=dev-python/meld3-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-4.0.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=6cb2ecb63fa9988714d3baa6aa09df46
+_md5_=76dc4ce8fc83df9703eee78b2f6fc00f
diff --git a/metadata/md5-cache/app-admin/supervisor-4.0.4 b/metadata/md5-cache/app-admin/supervisor-4.0.4
index 0c365eadaeb9..720d0fda27e8 100644
--- a/metadata/md5-cache/app-admin/supervisor-4.0.4
+++ b/metadata/md5-cache/app-admin/supervisor-4.0.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=repoze ZPL BSD HPND GPL-2
 RDEPEND=>=dev-python/meld3-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-4.0.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0fb6f6f78e8194a3385ad9c1b4ac5390
+_md5_=fa2d59adb0c230084367095cc25d8deb
diff --git a/metadata/md5-cache/app-admin/yadm-1.12.0 b/metadata/md5-cache/app-admin/yadm-1.12.0
index ef4afd129b78..f1dba2696354 100644
--- a/metadata/md5-cache/app-admin/yadm-1.12.0
+++ b/metadata/md5-cache/app-admin/yadm-1.12.0
@@ -7,7 +7,8 @@ IUSE=zsh-completion test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-vcs/git app-crypt/gnupg zsh-completion? ( app-shells/gentoo-zsh-completions )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TheLocehiliosan/yadm/archive/1.12.0.tar.gz -> yadm-1.12.0.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=67499028640edf8ef15212e3a79f58a0
+_md5_=a88cdb67d41ec42ab61a3bfea6d76d51
diff --git a/metadata/md5-cache/app-arch/bloscpack-0.11.0 b/metadata/md5-cache/app-arch/bloscpack-0.11.0
index 9a0ae60b15ed..1e149947e86f 100644
--- a/metadata/md5-cache/app-arch/bloscpack-0.11.0
+++ b/metadata/md5-cache/app-arch/bloscpack-0.11.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.11.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4bd99e448d68a3254a32b3fbf8c59db7
+_md5_=bbcbc7f1fb22eba713253ba211d48e14
diff --git a/metadata/md5-cache/app-arch/dpkg-1.19.0.5 b/metadata/md5-cache/app-arch/dpkg-1.19.0.5
index aae026deaef2..b03beb484c9c 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.19.0.5
+++ b/metadata/md5-cache/app-arch/dpkg-1.19.0.5
@@ -7,7 +7,8 @@ IUSE=+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.19.0.5.tar.xz
 _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_=5383480fbe9e702cfeeaab877ed6167c
+_md5_=aa203c6f404b61e9f9dae67b840850b9
diff --git a/metadata/md5-cache/app-arch/dpkg-1.19.6 b/metadata/md5-cache/app-arch/dpkg-1.19.6
index 3b2a7f13a967..5404508ecaf9 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.19.6
+++ b/metadata/md5-cache/app-arch/dpkg-1.19.6
@@ -7,7 +7,8 @@ IUSE=+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternative
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.19.6.tar.xz
 _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_=5c90616aec274df175108f149c843cda
+_md5_=44463b845fb51cba00be0b41ec67d0a9
diff --git a/metadata/md5-cache/app-arch/dpkg-1.19.7 b/metadata/md5-cache/app-arch/dpkg-1.19.7
index e76f3dee404d..fe2742a25442 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.19.7
+++ b/metadata/md5-cache/app-arch/dpkg-1.19.7
@@ -7,7 +7,8 @@ IUSE=+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternative
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.19.7.tar.xz
 _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_=5c90616aec274df175108f149c843cda
+_md5_=44463b845fb51cba00be0b41ec67d0a9
diff --git a/metadata/md5-cache/app-arch/dump-0.4.46 b/metadata/md5-cache/app-arch/dump-0.4.46
index 3f757948d7f9..cd5fe09b5469 100644
--- a/metadata/md5-cache/app-arch/dump-0.4.46
+++ b/metadata/md5-cache/app-arch/dump-0.4.46
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=sys-fs/e2fsprogs-1.27:= >=sys-libs/e2fsprogs-libs-1.27:= sys-apps/util-linux bzip2? ( >=app-arch/bzip2-1.0.2:= ) zlib? ( >=sys-libs/zlib-1.1.4:= ) lzo? ( dev-libs/lzo:2= ) sqlite? ( dev-db/sqlite:3= ) ermt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) readline? ( sys-libs/readline:0= sys-libs/ncurses:= static? ( sys-libs/ncurses:=[static-libs] ) )
 REQUIRED_USE=ermt? ( ssl ) ssl? ( zlib ) test? ( sqlite? ( uuid ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/dump/dump-0.4b46.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7de37ba7a386490a0bcf23bf3b48adea
+_md5_=3d5a37001d3dfb81c44893e7e850f194
diff --git a/metadata/md5-cache/app-arch/dump-0.4.46-r1 b/metadata/md5-cache/app-arch/dump-0.4.46-r1
index 3a57fe17ac79..ae624f145b1e 100644
--- a/metadata/md5-cache/app-arch/dump-0.4.46-r1
+++ b/metadata/md5-cache/app-arch/dump-0.4.46-r1
@@ -9,6 +9,7 @@ KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=sys-fs/e2fsprogs-1.27:= >=sys-libs/e2fsprogs-libs-1.27:= sys-apps/util-linux bzip2? ( >=app-arch/bzip2-1.0.2:= ) zlib? ( >=sys-libs/zlib-1.1.4:= ) lzo? ( dev-libs/lzo:2= ) sqlite? ( dev-db/sqlite:3= ) ermt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) readline? ( sys-libs/readline:0= sys-libs/ncurses:= static? ( sys-libs/ncurses:=[static-libs] ) )
 REQUIRED_USE=ermt? ( ssl ) ssl? ( zlib ) test? ( sqlite? ( uuid ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/dump/dump-0.4b46.tar.gz
-_md5_=c6975010d388bda98fea8dc9f0b5bc88
+_md5_=63e3e310e823af6c706f4eb37fbaad68
diff --git a/metadata/md5-cache/app-backup/rdup-1.1.15 b/metadata/md5-cache/app-backup/rdup-1.1.15
index 1a2beef1bede..8145641f1714 100644
--- a/metadata/md5-cache/app-backup/rdup-1.1.15
+++ b/metadata/md5-cache/app-backup/rdup-1.1.15
@@ -7,7 +7,8 @@ IUSE=debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libpcre dev-libs/nettle
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miekg/rdup/archive/1.1.15.tar.gz -> rdup-1.1.15.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_=93af2c843d637fbf452d6272a2e5f5a1
+_md5_=1d4efc32d12e59580a453c67587383d8
diff --git a/metadata/md5-cache/app-backup/restic-0.9.4 b/metadata/md5-cache/app-backup/restic-0.9.4
index 69e290c43994..a3111cd312ed 100644
--- a/metadata/md5-cache/app-backup/restic-0.9.4
+++ b/metadata/md5-cache/app-backup/restic-0.9.4
@@ -7,8 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT
 RDEPEND=sys-fs/fuse:0
-RESTRICT=strip
+RESTRICT=strip !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/restic/restic/archive/v0.9.4.tar.gz -> restic-0.9.4.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e25b6a2d79d8b69d67e60e3ff516fe71
+_md5_=c3aaca3966ae07c682c90d63e789db4b
diff --git a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.7-r1 b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.7-r1
index ec09f9ad429f..deb808927c06 100644
--- a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.7-r1
+++ b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.7-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linu
 LICENSE=GPL-2
 RDEPEND=!app-benchmarks/bootchart X? ( dev-python/pycairo[svg(+)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) sys-apps/lsb-release
 REQUIRED_USE=X? ( || ( python_targets_python2_7 python_targets_python3_5 ) ) test? ( X )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mmeeks/bootchart/archive/0.14.7.tar.gz -> bootchart2-0.14.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8c40058ae21262fa01e40857d7e0b403
+_md5_=539d0dd9cb5fe59e9fe1b7124e992b54
diff --git a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8 b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8
index 1a47a1abd775..7d253ecf7df8 100644
--- a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8
+++ b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linu
 LICENSE=GPL-2
 RDEPEND=!app-benchmarks/bootchart X? ( dev-python/pycairo[svg(+)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-apps/lsb-release
 REQUIRED_USE=X? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) test? ( X )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mmeeks/bootchart/archive/0.14.8.tar.gz -> bootchart2-0.14.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=798d50e3e92a908b360bbebae089e11f
+_md5_=2bebd4e9edfef1c26b1b71727b05f495
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.15-r1 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.15-r1
index 37cae732c52a..88fa7b5a4359 100644
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.15-r1
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.15-r1
@@ -7,7 +7,8 @@ IUSE=aio mysql postgres test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=aio? ( dev-libs/libaio ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.15.tar.gz -> sysbench-1.0.15.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=91db1313386b0c0594e28a1bec56f45d
+_md5_=00374844d94795fb47b58c8ede6c0134
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.16-r1 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.16-r1
index 8356eaa643ce..138f4ee39a6a 100644
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.16-r1
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.16-r1
@@ -8,7 +8,8 @@ IUSE=aio mysql postgres test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=aio? ( dev-libs/libaio ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.16.tar.gz -> sysbench-1.0.16.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9a5220cb3b905b6c9e23fa01d2fd760c
+_md5_=18249241680440135788194b661e96bb
diff --git a/metadata/md5-cache/app-cdr/brasero-3.12.2-r1 b/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
index bd147885dbbb..cbf5416573cb 100644
--- a/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
+++ b/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 PDEPEND=gnome-base/gvfs
 RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-1:0= ) media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0[mp3?] x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/dvd+rw-tools virtual/cdrtools ) packagekit? ( app-admin/packagekit-base )
+RESTRICT=!test? ( test )
 SLOT=0/3.1
 SRC_URI=mirror://gnome/sources/brasero/3.12/brasero-3.12.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac72dc2cbe2270ecf0b6753950ca862c
+_md5_=b05165c3a7228f4db3b15877649f9ae8
diff --git a/metadata/md5-cache/app-cdr/nrg2iso-0.4-r2 b/metadata/md5-cache/app-cdr/nrg2iso-0.4-r2
index f92ca4aec241..db0a649332d5 100644
--- a/metadata/md5-cache/app-cdr/nrg2iso-0.4-r2
+++ b/metadata/md5-cache/app-cdr/nrg2iso-0.4-r2
@@ -5,7 +5,8 @@ HOMEPAGE=http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html
 IUSE=test
 KEYWORDS=amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2+
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://gregory.kokanosky.free.fr/v4/linux/nrg2iso-0.4.tar.gz test? ( https://yegortimoshenko.s3.amazonaws.com/nrg2iso-test.iso https://yegortimoshenko.s3.amazonaws.com/nrg2iso-test.nrg )
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f23daafb2e76c70c69432c530eb11694
+_md5_=13efb9f8f58666b7e7170588318d4330
diff --git a/metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1 b/metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1
index a5fc5dc87e30..bf1969850d10 100644
--- a/metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1
+++ b/metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/uif2iso-0.1.7c.zip test? ( https://yegortimoshenko.s3.amazonaws.com/uif2iso-test.iso https://yegortimoshenko.s3.amazonaws.com/uif2iso-test.uif )
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b0cf5e275bacabc3afbca4092681efa4
+_md5_=88edaceac4e33b1a941f4ddbc5c3dd0e
diff --git a/metadata/md5-cache/app-crypt/acme-0.39.0 b/metadata/md5-cache/app-crypt/acme-0.39.0
index b4702eb7d48e..8bcf7b37784a 100644
--- a/metadata/md5-cache/app-crypt/acme-0.39.0
+++ b/metadata/md5-cache/app-crypt/acme-0.39.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.39.0.tar.gz -> certbot-0.39.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d7e24381df2403b6b292a3e7e723b56b
+_md5_=ebf40ece530e3ba96dff08515ab29107
diff --git a/metadata/md5-cache/app-crypt/certbot-0.39.0 b/metadata/md5-cache/app-crypt/certbot-0.39.0
index b32b53d11291..39fc5bd87c57 100644
--- a/metadata/md5-cache/app-crypt/certbot-0.39.0
+++ b/metadata/md5-cache/app-crypt/certbot-0.39.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.39.0.tar.gz -> certbot-0.39.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d162e9940a943f11c1b68d65f2c79837
+_md5_=d3f63c8837379fa03c9a000f2482c0fb
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.39.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.39.0
index 33689633dbeb..89e7b44d6fa3 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-0.39.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.39.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-0.39.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.39.0.tar.gz -> certbot-0.39.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cc5f9bafc5d548ca2799ed437b4bcfa5
+_md5_=e0e35503fec8267deca196dd829d9d40
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.5.0 b/metadata/md5-cache/app-crypt/heimdal-7.5.0
index e057679c68c9..c19445eb5dcb 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.5.0
+++ b/metadata/md5-cache/app-crypt/heimdal-7.5.0
@@ -7,7 +7,8 @@ IUSE=afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86
 LICENSE=BSD
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.5.0/heimdal-7.5.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=7959bf8d2e4b96f99ffb51173387391d
+_md5_=581eb33cb11b5b986e0457946e3b3c17
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.6.0 b/metadata/md5-cache/app-crypt/heimdal-7.6.0
index 6e754b352b63..309ef2097905 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.6.0
+++ b/metadata/md5-cache/app-crypt/heimdal-7.6.0
@@ -8,7 +8,8 @@ IUSE=afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp selinux ssl static-l
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 s390 ~sh ~sparc x86
 LICENSE=BSD
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.6.0/heimdal-7.6.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=9fed39225945f6201c3d7bef18e725fa
+_md5_=ce3ab7e8bfb6f55f61e9d0abe9bac490
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.7.0-r1 b/metadata/md5-cache/app-crypt/heimdal-7.7.0-r1
index 00f4b02c8370..d960d6e192aa 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.7.0-r1
+++ b/metadata/md5-cache/app-crypt/heimdal-7.7.0-r1
@@ -8,7 +8,8 @@ IUSE=afs +berkdb caps gdbm hdb-ldap libressl +lmdb otp selinux ssl static-libs t
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.7.0/heimdal-7.7.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=f1f412395bf36358fbfa748be403c882
+_md5_=3509ad4c22104330db7b404115a1a70c
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18.6-r1 b/metadata/md5-cache/app-crypt/libsecret-0.18.6-r1
index 861e25b4426a..dabef8c04255 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18.6-r1
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18.6-r1
@@ -9,7 +9,8 @@ LICENSE=LGPL-2.1+ Apache-2.0
 PDEPEND=>=gnome-base/gnome-keyring-3
 RDEPEND=>=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
 REQUIRED_USE=test? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.6.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32a7710016d30035f1d56280ef325fbd
+_md5_=0b5c8aad16a08efeed13e9101ac06088
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18.8 b/metadata/md5-cache/app-crypt/libsecret-0.18.8
index ac6fe870e228..83667906cc48 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18.8
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18.8
@@ -9,7 +9,8 @@ LICENSE=LGPL-2.1+ Apache-2.0
 PDEPEND=>=gnome-base/gnome-keyring-3
 RDEPEND=>=dev-libs/glib-2.44:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
 REQUIRED_USE=test? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.8.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86c353e7b58aae656b5c80b1636bb05e
+_md5_=b039640e5149b4761bedb0e2b91888a2
diff --git a/metadata/md5-cache/app-crypt/libu2f-server-1.1.0 b/metadata/md5-cache/app-crypt/libu2f-server-1.1.0
index 9be6afdc773b..2467eacdbea2 100644
--- a/metadata/md5-cache/app-crypt/libu2f-server-1.1.0
+++ b/metadata/md5-cache/app-crypt/libu2f-server-1.1.0
@@ -7,7 +7,8 @@ IUSE=libressl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 ab
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=!libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/hidapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/json-c:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0/0.1
 SRC_URI=https://developers.yubico.com/libu2f-server/Releases/libu2f-server-1.1.0.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fa709e5032ac315264d9a345605ddd7a
+_md5_=7905a04d1f3903fcce1ea871ac25492d
diff --git a/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-release-20190427 b/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-release-20190427
index dab6b5d39459..bb38370078c3 100644
--- a/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-release-20190427
+++ b/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-release-20190427
@@ -6,6 +6,7 @@ HOMEPAGE=https://www.gentoo.org/downloads/signatures/
 IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86
 LICENSE=public-domain
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.20190427.gz test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20190224.tar.gz )
-_md5_=7dcdaf5158de89d976e63282dcec58b0
+_md5_=6295bbf3e1c650a948a350f8ec9c0ebb
diff --git a/metadata/md5-cache/app-crypt/pkcrack-1.2.2-r1 b/metadata/md5-cache/app-crypt/pkcrack-1.2.2-r1
index 99a4fc261b2a..bc8a8a0e8ae8 100644
--- a/metadata/md5-cache/app-crypt/pkcrack-1.2.2-r1
+++ b/metadata/md5-cache/app-crypt/pkcrack-1.2.2-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=pkcrack
 RDEPEND=!<app-text/html-xml-utils-5.3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/pkcrack-1.2.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0253bc98a0118aedad25e3c63d3aa6a0
+_md5_=a07f497f4292e313764281bd8dd0329e
diff --git a/metadata/md5-cache/app-crypt/qca-2.2.0 b/metadata/md5-cache/app-crypt/qca-2.2.0
index 34d2cac44af5..fdbc6d4bb812 100644
--- a/metadata/md5-cache/app-crypt/qca-2.2.0
+++ b/metadata/md5-cache/app-crypt/qca-2.2.0
@@ -8,7 +8,8 @@ IUSE=botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softsto
 KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:= ) )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://kde/stable/qca/2.2.0/qca-2.2.0.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22939c5333683e41c299f21bee9155f3
+_md5_=c5a1c7185c83b08eb99e0c2a94e018c0
diff --git a/metadata/md5-cache/app-crypt/qca-2.2.1 b/metadata/md5-cache/app-crypt/qca-2.2.1
index 06934d4e7aad..5acea3e62a4d 100644
--- a/metadata/md5-cache/app-crypt/qca-2.2.1
+++ b/metadata/md5-cache/app-crypt/qca-2.2.1
@@ -8,7 +8,8 @@ IUSE=botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softsto
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:= ) )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://kde/stable/qca/2.2.1/qca-2.2.1.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8782555edf8763284a95c637ed020c5
+_md5_=ffe82d61b471cb31d4d2d4d39a8633cf
diff --git a/metadata/md5-cache/app-crypt/swtpm-0.2.0 b/metadata/md5-cache/app-crypt/swtpm-0.2.0
index 3a3799982fc1..30756a673a03 100644
--- a/metadata/md5-cache/app-crypt/swtpm-0.2.0
+++ b/metadata/md5-cache/app-crypt/swtpm-0.2.0
@@ -8,7 +8,8 @@ IUSE=fuse gnutls seccomp test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-libs/libtpms dev-libs/openssl:0 fuse? ( dev-libs/glib:2 sys-fs/fuse:0 ) gnutls? ( dev-libs/libtasn1:= >=net-libs/gnutls-3.1.0[tools] ) seccomp? ( sys-libs/libseccomp ) app-crypt/tpm-tools app-crypt/trousers dev-tcltk/expect
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefanberger/swtpm/archive/v0.2.0.tar.gz -> swtpm-0.2.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=712295e0fe45382ae7960d8fe7db3b62
+_md5_=1e1d79fb843a3e5f279081feb876fa99
diff --git a/metadata/md5-cache/app-crypt/tpm2-abrmd-2.1.1 b/metadata/md5-cache/app-crypt/tpm2-abrmd-2.1.1
index 8e6be566c7ca..303103944276 100644
--- a/metadata/md5-cache/app-crypt/tpm2-abrmd-2.1.1
+++ b/metadata/md5-cache/app-crypt/tpm2-abrmd-2.1.1
@@ -8,7 +8,8 @@ IUSE=static-libs test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=sys-apps/dbus:= dev-libs/glib:= app-crypt/tpm2-tss:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-abrmd/releases/download/2.1.1/tpm2-abrmd-2.1.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=5cbad9162c3dbec4259e06658a5f0bac
+_md5_=9a4cf07ce5c8d91d3a12ce155175879c
diff --git a/metadata/md5-cache/app-crypt/tpm2-tools-3.1.4 b/metadata/md5-cache/app-crypt/tpm2-tools-3.1.4
index 07bc67bb7ccf..98e725d8f05a 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tools-3.1.4
+++ b/metadata/md5-cache/app-crypt/tpm2-tools-3.1.4
@@ -8,6 +8,7 @@ IUSE=libressl test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=>=app-crypt/tpm2-tss-2.0:= net-misc/curl:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/3.1.4/tpm2-tools-3.1.4.tar.gz
-_md5_=20bec7eaf66b70c9ce9cf680a416d3a5
+_md5_=521eef28a693e0d1fb0252ace09add60
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3 b/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3
index a675c505ac2b..d8bf8e6a308f 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=gcrypt? ( !openssl ) openssl? ( !gcrypt ) || ( gcrypt openssl )
+RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.2.3/tpm2-tss-2.2.3.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=e39bf6501bef9b17b71c15411ecb13fb
+_md5_=46bb7b740d231d43fa40843360987412
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.0.0 b/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.0.0
index 60eced5732b4..8dff9a1544e3 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.0.0
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-engine-1.0.0
@@ -8,7 +8,8 @@ IUSE=libressl test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=>=app-crypt/tpm2-tss-2.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-tss-engine/releases/download/v1.0.0/tpm2-tss-engine-1.0.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=88e25df5422183dda1169cd7588538bc
+_md5_=c395e024a3bb68682d408d0da3d38aea
diff --git a/metadata/md5-cache/app-dicts/gwaei-3.6.2 b/metadata/md5-cache/app-dicts/gwaei-3.6.2
index 566ca64df1e5..c0c305d3e1cc 100644
--- a/metadata/md5-cache/app-dicts/gwaei-3.6.2
+++ b/metadata/md5-cache/app-dicts/gwaei-3.6.2
@@ -7,7 +7,8 @@ IUSE=gtk hunspell nls test mecab
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=net-misc/curl-7.20.0 >=dev-libs/glib-2.31 gtk? ( x11-libs/gtk+:3 >=app-text/gnome-doc-utils-0.14.0 ) hunspell? ( app-text/hunspell ) nls? ( virtual/libintl ) mecab? ( app-text/mecab )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gwaei/gwaei-3.6.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac52830e0fa62b5f182435c918df8a58
+_md5_=dfc745286f3e7637ada069e40c8ca569
diff --git a/metadata/md5-cache/app-editors/vis-0.5 b/metadata/md5-cache/app-editors/vis-0.5
index ad630c239b75..b981f22ad9fa 100644
--- a/metadata/md5-cache/app-editors/vis-0.5
+++ b/metadata/md5-cache/app-editors/vis-0.5
@@ -7,6 +7,7 @@ IUSE=+ncurses selinux test tre
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) tre? ( dev-libs/tre:= ) app-eselect/eselect-vi
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martanne/vis/releases/download/v0.5/vis-v0.5.tar.gz -> vis-0.5.tar.gz test? ( https://github.com/martanne/vis-test/releases/download/v0.3/vis-test-0.3.tar.gz -> vis-test-0.3.tar.gz )
-_md5_=f45198242351316d2e3ee77dc598db0d
+_md5_=7d84df9d69d3542ae2a097395c3e549f
diff --git a/metadata/md5-cache/app-editors/vis-9999 b/metadata/md5-cache/app-editors/vis-9999
index 0e58ff7fc127..82c6b2e84479 100644
--- a/metadata/md5-cache/app-editors/vis-9999
+++ b/metadata/md5-cache/app-editors/vis-9999
@@ -7,6 +7,7 @@ IUSE=+ncurses selinux test tre
 LICENSE=ISC
 PROPERTIES=live
 RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) tre? ( dev-libs/tre:= ) app-eselect/eselect-vi
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd
-_md5_=a5fcfab6ca6a58046f5d21339d376a8d
+_md5_=25fbb13cbbc96efbe1f1f9b052997d1a
diff --git a/metadata/md5-cache/app-emulation/cloud-init-18.4-r1 b/metadata/md5-cache/app-emulation/cloud-init-18.4-r1
index bdc7dab258e9..0c859d762cea 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-18.4-r1
+++ b/metadata/md5-cache/app-emulation/cloud-init-18.4-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/oauthlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configobj-5.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonpatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonschema[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-analyzer/macchanger sys-apps/iproute2 sys-fs/growpart virtual/logger python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/18.4/+download/cloud-init-18.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78bdd1cf51ecbca7094c827475c7208a
+_md5_=053bcf9caf64d5680cfd462f78ea7b4c
diff --git a/metadata/md5-cache/app-emulation/cloud-init-18.5 b/metadata/md5-cache/app-emulation/cloud-init-18.5
index fb606e10e141..eb8af9e110a9 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-18.5
+++ b/metadata/md5-cache/app-emulation/cloud-init-18.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/oauthlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configobj-5.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonpatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonschema[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-analyzer/macchanger sys-apps/iproute2 sys-fs/growpart virtual/logger python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/18.5/+download/cloud-init-18.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a26a93a471dfe6c5a5b6c5521e5f2d85
+_md5_=4ca4606159b3db7c142f02dc671131cc
diff --git a/metadata/md5-cache/app-emulation/cloud-init-9999 b/metadata/md5-cache/app-emulation/cloud-init-9999
index 7a5ddd523292..066ae4a91166 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-9999
+++ b/metadata/md5-cache/app-emulation/cloud-init-9999
@@ -8,6 +8,7 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/oauthlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configobj-5.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonpatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonschema[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-analyzer/macchanger sys-apps/iproute2 sys-fs/growpart virtual/logger python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09486c51f6dbc36e2d3e5b4911de958b
+_md5_=da07f882cde43896d9f8ec49c06009c8
diff --git a/metadata/md5-cache/app-emulation/faudio-19.06 b/metadata/md5-cache/app-emulation/faudio-19.06
index 25c5159a4b43..9ee76a973804 100644
--- a/metadata/md5-cache/app-emulation/faudio-19.06
+++ b/metadata/md5-cache/app-emulation/faudio-19.06
@@ -9,7 +9,8 @@ KEYWORDS=-* ~amd64 ~x86
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl2-2.0.9[sound,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( media-video/ffmpeg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FNA-XNA/FAudio/archive/19.06.tar.gz -> FAudio-19.06.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4995956d2047d4c334430f1aed545815
+_md5_=54d0c7a0e6c88569e63f6165f72fa046
diff --git a/metadata/md5-cache/app-emulation/faudio-19.09 b/metadata/md5-cache/app-emulation/faudio-19.09
index fc75975ec7f8..e772e326ffae 100644
--- a/metadata/md5-cache/app-emulation/faudio-19.09
+++ b/metadata/md5-cache/app-emulation/faudio-19.09
@@ -9,7 +9,8 @@ KEYWORDS=-* ~amd64 ~x86
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl2-2.0.9[sound,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( media-video/ffmpeg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FNA-XNA/FAudio/archive/19.09.tar.gz -> FAudio-19.09.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4995956d2047d4c334430f1aed545815
+_md5_=54d0c7a0e6c88569e63f6165f72fa046
diff --git a/metadata/md5-cache/app-emulation/faudio-9999 b/metadata/md5-cache/app-emulation/faudio-9999
index 0003ca053f56..86f55c671df9 100644
--- a/metadata/md5-cache/app-emulation/faudio-9999
+++ b/metadata/md5-cache/app-emulation/faudio-9999
@@ -9,6 +9,7 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=>=media-libs/libsdl2-2.0.9[sound,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( media-video/ffmpeg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4995956d2047d4c334430f1aed545815
+_md5_=54d0c7a0e6c88569e63f6165f72fa046
diff --git a/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8 b/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8
index 8cd6c0c37bfd..5bb005dc290a 100644
--- a/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8
+++ b/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 >=sys-fs/lvm2-2.02.181 >=sys-apps/baselayout-2.0 >=dev-lang/ghc-8.0:0= <dev-lang/ghc-8.1:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= !<app-emulation/ganeti-instance-image-0.6-r1 >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-1.0.1.0:0= <dev-haskell/monad-control-1.0.2:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-1.0.1:0= <dev-haskell/snap-core-1.1:0= >=dev-haskell/snap-server-1.0.1:0= <dev-haskell/snap-server-1.1:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
 REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://downloads.ganeti.org/releases/2.15/ganeti-2.15.2.tar.gz mirror://debian/pool/main/g/ganeti-2.15/ganeti-2.15_2.15.2-11.debian.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=d1718d8a605ea7a3b67d39a617557bd4
+_md5_=463c663ce021657fe9b668784e517104
diff --git a/metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1 b/metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1
index 8b85dcbebcb4..2f49ac05b927 100644
--- a/metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1
+++ b/metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-0.3.1.3:0= <dev-haskell/monad-control-1.1:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4.1:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-0.8.1:0= <dev-haskell/snap-core-0.10:0= >=dev-haskell/snap-server-0.8.1:0= <dev-haskell/snap-server-0.10:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
 REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://downloads.ganeti.org/releases/2.16/ganeti-2.16.0~rc1.tar.gz mirror://debian/pool/main/g/ganeti/ganeti_2.16.0~rc1-1.debian.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f19de9ff882906375b91f66585329aa4
+_md5_=67ce94e7c5af7fc136c307d6c0c442c9
diff --git a/metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1 b/metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1
index 4de7eeaec446..82382be2e7f5 100644
--- a/metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1
+++ b/metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-0.3.1.3:0= <dev-haskell/monad-control-1.1:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4.1:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-0.8.1:0= <dev-haskell/snap-core-0.10:0= >=dev-haskell/snap-server-0.8.1:0= <dev-haskell/snap-server-0.10:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
 REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://downloads.ganeti.org/releases/2.17/ganeti-2.17.0~beta1.tar.gz mirror://debian/pool/main/g/ganeti/ganeti_2.16.0~rc1-1.debian.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cc9bcdf0a42b0b30506cdbb61a3ff9d8
+_md5_=1d8ea562c54eab9c1675835f732db98f
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.13 b/metadata/md5-cache/app-emulation/libguestfs-1.36.13
index 50dcad28c08a..ba4ff0da0f5e 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.13
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.13
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0/1.36
 SRC_URI=http://libguestfs.org/download/1.36-stable/libguestfs-1.36.13.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=81e026c03393935312ea4ff2fa307e9e
+_md5_=c403eef7b9f8e8f0349d33089df3dc0d
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.15 b/metadata/md5-cache/app-emulation/libguestfs-1.36.15
index 9438da4bc207..dc0ab1bac64d 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.15
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.15
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0/1.36
 SRC_URI=http://libguestfs.org/download/1.36-stable/libguestfs-1.36.15.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6ec012f35b55b4f5cfa10932416dc95
+_md5_=d86755a3a13f552ead0b4fbbb4019cc4
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6
index b3d81ae5cea4..915d3703f43f 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0/1.38
 SRC_URI=http://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cbc46b92224069a4ff7863bcf06a1868
+_md5_=d7844613a2764edd630ebf85401599d3
diff --git a/metadata/md5-cache/app-emulation/lxd-3.14 b/metadata/md5-cache/app-emulation/lxd-3.14
index c5d651fa9ec9..f2b3e0537eb1 100644
--- a/metadata/md5-cache/app-emulation/lxd-3.14
+++ b/metadata/md5-cache/app-emulation/lxd-3.14
@@ -8,7 +8,8 @@ IUSE=+daemon +ipv6 +dnsmasq nls test tools kernel_linux
 KEYWORDS=amd64
 LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
 RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dev-libs/libuv dev-libs/lzo dev-util/xdelta:3 dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-firewall/ebtables net-firewall/iptables[ipv6?] net-libs/libnfnetlink net-libs/libnsl:0= net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/fuse sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-3.14.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=e484789f2deb6084ac35cebd4374eda6
+_md5_=f58e44f69caeee015c3d088c86282165
diff --git a/metadata/md5-cache/app-emulation/sen-0.6.0 b/metadata/md5-cache/app-emulation/sen-0.6.0
index 85cde03b2aaf..9b8ba2bdb7a5 100644
--- a/metadata/md5-cache/app-emulation/sen-0.6.0
+++ b/metadata/md5-cache/app-emulation/sen-0.6.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/urwid[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urwidtrees[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docker-py[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sen/sen-0.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3b029e7881a08930e697ced8b6ab2a3
+_md5_=c7610505392e3957459dc27c430add71
diff --git a/metadata/md5-cache/app-emulation/sen-0.6.1 b/metadata/md5-cache/app-emulation/sen-0.6.1
index bb50f9550a71..900dc3efbddb 100644
--- a/metadata/md5-cache/app-emulation/sen-0.6.1
+++ b/metadata/md5-cache/app-emulation/sen-0.6.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/urwid[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urwidtrees[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docker-py[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sen/sen-0.6.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6622bc2140855d690d855dc0172bd92b
+_md5_=158f5cfa52aab3b1a721eae6442511f0
diff --git a/metadata/md5-cache/app-emulation/winetricks-20190912 b/metadata/md5-cache/app-emulation/winetricks-20190912
index a9be9ccaf913..f7a80cbc7542 100644
--- a/metadata/md5-cache/app-emulation/winetricks-20190912
+++ b/metadata/md5-cache/app-emulation/winetricks-20190912
@@ -8,7 +8,8 @@ IUSE=gtk kde rar test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Winetricks/winetricks/archive/20190912.tar.gz -> winetricks-20190912.tar.gz gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~chiitoo/distfiles/winetricks-gentoo-2012.11.24.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8a17552c2ddf0291891abe09b1b6cb4
+_md5_=0b9d0d7071d431e8755a601be7aef2c4
diff --git a/metadata/md5-cache/app-emulation/winetricks-99999999 b/metadata/md5-cache/app-emulation/winetricks-99999999
index 75b84fd414b3..cfaba398118c 100644
--- a/metadata/md5-cache/app-emulation/winetricks-99999999
+++ b/metadata/md5-cache/app-emulation/winetricks-99999999
@@ -8,7 +8,8 @@ IUSE=gtk kde rar test
 LICENSE=LGPL-2.1+
 PROPERTIES=live
 RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unzip net-misc/wget virtual/wine x11-misc/xdg-utils gtk? ( gnome-extra/zenity ) kde? ( kde-apps/kdialog ) rar? ( app-arch/unrar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/winetricks-gentoo-2012.11.24.tar.bz2 ) kde? ( https://dev.gentoo.org/~chiitoo/distfiles/winetricks-gentoo-2012.11.24.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	6d22636df236df4cc8475f7b7668bdcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2f8778d97b7fb83c22bc3c47c14e75e0
+_md5_=771c9fff1f0327c35e4f7aa1db2f013f
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-4.5.0 b/metadata/md5-cache/app-forensics/sleuthkit-4.5.0
index c205a34c00a0..fce1b4e0c588 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.5.0
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.5.0
@@ -7,7 +7,8 @@ IUSE=aff doc ewf java static-libs test +threads zlib elibc_FreeBSD java elibc_Fr
 KEYWORDS=amd64 hppa ppc x86
 LICENSE=BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )
 RDEPEND=dev-db/sqlite:3 dev-lang/perl:* aff? ( app-forensics/afflib ) ewf? ( app-forensics/libewf:= ) java? ( >=virtual/jdk-1.8:* >=dev-java/c3p0-0.9.5:0 >=dev-java/jdbc-postgresql-9.4:0 ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jre-1.8:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RESTRICT=!test? ( test )
 SLOT=0/13
 SRC_URI=https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.5.0/sleuthkit-4.5.0.tar.gz java? ( http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.8.11/sqlite-jdbc-3.8.11.jar )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=06eddc53c20b3b8ee3ed68f530125694
+_md5_=52386d80640c365210594645f7ad033d
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-4.6.5 b/metadata/md5-cache/app-forensics/sleuthkit-4.6.5
index 53ed45cabab1..ce120d8a52a3 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.6.5
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.6.5
@@ -7,7 +7,8 @@ IUSE=aff doc ewf java postgres static-libs test +threads zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )
 RDEPEND=dev-db/sqlite:3 dev-lang/perl:* aff? ( app-forensics/afflib ) ewf? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.8:* >=dev-java/c3p0-0.9.5:0 >=dev-java/jdbc-postgresql-9.4:0 ) postgres? ( dev-db/postgresql:= ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jre-1.8:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RESTRICT=!test? ( test )
 SLOT=0/13
 SRC_URI=https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.6.5/sleuthkit-4.6.5.tar.gz java? ( http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.8.11/sqlite-jdbc-3.8.11.jar http://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.1/SparseBitSet-1.1.jar ) ewf? ( https://dev.gentoo.org/~gokturk/distfiles/app-forensics/libewf/libewf-20130128.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=986b6c1d5ebe2650ac0a6fce16a555cc
+_md5_=3e0040b8de53dd5dc8ecc66f1ee28d7f
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-4.6.6 b/metadata/md5-cache/app-forensics/sleuthkit-4.6.6
index d3383d01e81d..9557ba7687aa 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.6.6
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.6.6
@@ -7,7 +7,8 @@ IUSE=aff doc ewf java postgres static-libs test +threads zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )
 RDEPEND=dev-db/sqlite:3 dev-lang/perl:* aff? ( app-forensics/afflib ) ewf? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.8:* >=dev-java/c3p0-0.9.5:0 >=dev-java/jdbc-postgresql-9.4:0 ) postgres? ( dev-db/postgresql:= ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jre-1.8:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RESTRICT=!test? ( test )
 SLOT=0/13
 SRC_URI=https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.6.6/sleuthkit-4.6.6.tar.gz java? ( http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar http://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.1/SparseBitSet-1.1.jar ) ewf? ( https://dev.gentoo.org/~gokturk/distfiles/app-forensics/libewf/libewf-20130128.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d95422b14c2f81d29c37ddab787c4c2c
+_md5_=e40560a69555cbb43afd54aa64455b05
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-4.6.7 b/metadata/md5-cache/app-forensics/sleuthkit-4.6.7
index a833e9419444..0e01a09e9791 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.6.7
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.6.7
@@ -7,7 +7,8 @@ IUSE=aff doc ewf java postgres static-libs test +threads zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )
 RDEPEND=dev-db/sqlite:3 dev-lang/perl:* aff? ( app-forensics/afflib ) ewf? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.8:* >=dev-java/c3p0-0.9.5:0 >=dev-java/jdbc-postgresql-9.4:0 ) postgres? ( dev-db/postgresql:= ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jre-1.8:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RESTRICT=!test? ( test )
 SLOT=0/13
 SRC_URI=https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.6.7/sleuthkit-4.6.7.tar.gz java? ( http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar http://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.1/SparseBitSet-1.1.jar ) ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c39294f70a05b4847e8d160a4dfa40fb
+_md5_=881fd93b8043cf7ac0c1ed1f6684ed07
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-4.7.0 b/metadata/md5-cache/app-forensics/sleuthkit-4.7.0
index 7f5a11e577a6..91ee4288b641 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.7.0
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.7.0
@@ -7,7 +7,8 @@ IUSE=aff doc ewf java postgres static-libs test +threads zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )
 RDEPEND=dev-db/sqlite:3 dev-lang/perl:* aff? ( app-forensics/afflib ) ewf? ( sys-libs/zlib ) java? ( >=dev-java/c3p0-0.9.5:0 dev-java/commons-lang:3.1 dev-java/guava:20 >=dev-java/jdbc-postgresql-9.4:0 >=dev-java/joda-time-2.4:0 ) postgres? ( dev-db/postgresql:= ) zlib? ( sys-libs/zlib ) java? ( || ( dev-java/oracle-jre-bin:1.8[javafx] dev-java/oracle-jdk-bin:1.8[javafx] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RESTRICT=!test? ( test )
 SLOT=0/13
 SRC_URI=https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.7.0/sleuthkit-4.7.0.tar.gz java? ( http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar http://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.1/SparseBitSet-1.1.jar ) ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8b168eb496565b80b36798dd9d688eb2
+_md5_=7b765aea91dd99e4e76c66847f23fee6
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.2.9.6 b/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
index 693a59b9c283..382d9ecdbbbd 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
+++ b/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=BSD-1 GPL-2+ LGPL-2+ MIT
 RDEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) xml? ( app-text/iso-codes dev-libs/libxml2 )
 REQUIRED_USE=cairo? ( X ) pango? ( cairo )
+RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx/fcitx-4.2.9.6_dict.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=edd5538cf3b85db45c590a72b7648444
+_md5_=35e85431ca111b4d296af6e70c9c605a
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.9999 b/metadata/md5-cache/app-i18n/fcitx-4.9999
index f878ea927eb2..fea860413c5c 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-4.9999
@@ -8,7 +8,8 @@ LICENSE=BSD-1 GPL-2+ LGPL-2+ MIT
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) xml? ( app-text/iso-codes dev-libs/libxml2 )
 REQUIRED_USE=cairo? ( X ) pango? ( cairo )
+RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7920a1fd046d369fc52477fc474b99a3
+_md5_=c8669643b17a895bcfe6e202fd912d1a
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.18 b/metadata/md5-cache/app-i18n/ibus-1.5.18
index 48e4d3da27e0..aa8ab4cf5be1 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.18
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.18
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
 REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) introspection ) test? ( gtk ) vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.18/ibus-1.5.18.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b265ea1b5a95d84d4013f9b8753ee08
+_md5_=8284d7160084e28cd3ac3d627104390d
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.19 b/metadata/md5-cache/app-i18n/ibus-1.5.19
index 9fb31496436c..c576023a3700 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.19
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.19
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
 REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) introspection ) test? ( gtk ) vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.19/ibus-1.5.19.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be94a48ca7c804441180013b73b70ac9
+_md5_=8c29a0e4422bed4efb3758d65945b38e
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.20 b/metadata/md5-cache/app-i18n/ibus-1.5.20
index db6ec09b42b4..9b5349d47818 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.20
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.20
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
 REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) introspection ) test? ( gtk ) vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.20/ibus-1.5.20.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49bd85a54f4b24cd4ac6fa2216894df0
+_md5_=8e3c708e16e658c42afd1442b3ced799
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.21 b/metadata/md5-cache/app-i18n/ibus-1.5.21
index 1ed21a198282..d7a8e38e7241 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.21
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.21
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
 REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) introspection ) test? ( gtk ) vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.21/ibus-1.5.21.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=968376a849108ef129e7ef201e2c7cbb
+_md5_=9056b60df43534f8d0bffd6fa2bd20ba
diff --git a/metadata/md5-cache/app-i18n/libhangul-0.1.0 b/metadata/md5-cache/app-i18n/libhangul-0.1.0
index ba8ad5d18b57..9ec2f3363c96 100644
--- a/metadata/md5-cache/app-i18n/libhangul-0.1.0
+++ b/metadata/md5-cache/app-i18n/libhangul-0.1.0
@@ -7,6 +7,7 @@ IUSE=nls static-libs test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=virtual/libiconv nls? ( virtual/libintl )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-0.1.0.tar.gz
-_md5_=02e26c9eeeebaabf063a36976c8785c1
+_md5_=d6b6ca3c01713a5993c9bc42b6d1a533
diff --git a/metadata/md5-cache/app-i18n/multiskkserv-20100128 b/metadata/md5-cache/app-i18n/multiskkserv-20100128
index 398f0f8f84a6..f80d69d940db 100644
--- a/metadata/md5-cache/app-i18n/multiskkserv-20100128
+++ b/metadata/md5-cache/app-i18n/multiskkserv-20100128
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=app-i18n/skk-jisyo[cdb]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www3.big.or.jp/~sian/linux/products/multiskkserv-20100128.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9295f2bbfa27cdaafce10f547d8a9f9d
+_md5_=e41e1d4d6e2c7108f569ec2a2f0bf4ee
diff --git a/metadata/md5-cache/app-i18n/opencc-1.0.5 b/metadata/md5-cache/app-i18n/opencc-1.0.5
index a265e0baa980..65d1924b51ab 100644
--- a/metadata/md5-cache/app-i18n/opencc-1.0.5
+++ b/metadata/md5-cache/app-i18n/opencc-1.0.5
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/BYVoid/OpenCC
 IUSE=doc test
 KEYWORDS=amd64 ~arm64 hppa ppc ppc64 ~sparc x86
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/BYVoid/OpenCC/archive/ver.1.0.5.tar.gz -> opencc-1.0.5.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b5da7811f8596b1980d85c6cdfcf31e
+_md5_=e7f268094258fd17a05115a143cfcf39
diff --git a/metadata/md5-cache/app-i18n/opencc-9999 b/metadata/md5-cache/app-i18n/opencc-9999
index bdf5ac9f469c..c88f5725ba7b 100644
--- a/metadata/md5-cache/app-i18n/opencc-9999
+++ b/metadata/md5-cache/app-i18n/opencc-9999
@@ -6,6 +6,7 @@ HOMEPAGE=https://github.com/BYVoid/OpenCC
 IUSE=doc test
 LICENSE=Apache-2.0
 PROPERTIES=live
+RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=06b743a469c00234fea9cb5f94cc57bd
+_md5_=175f359b75285f8d646a66cadd0d4370
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.12.4 b/metadata/md5-cache/app-i18n/transifex-client-0.12.4
index 51ee092cea0e..05cafd84a719 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.12.4
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.12.4
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.12.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6df305872389d566dd2cca1425d1aa17
+_md5_=248a6a9e4f85f2377c6b58a278aa1b1d
diff --git a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.10 b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.10
index e0c280e7d2c1..2a0ab340113d 100644
--- a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.10
+++ b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.10
@@ -7,6 +7,7 @@ IUSE=+bidi +curl test tts
 KEYWORDS=~amd64
 LICENSE=Unlicense
 RDEPEND=app-misc/rlwrap =sys-apps/gawk-4* curl? ( net-misc/curl[ssl] ) bidi? ( dev-libs/fribidi ) tts? ( || ( media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/soimort/translate-shell/archive/v0.9.6.10.tar.gz -> translate-shell-0.9.6.10.tar.gz
-_md5_=da457f08335058a2311de9c7a52a58a0
+_md5_=a1db283635328cfa631774103ad78564
diff --git a/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2 b/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
index 6c829511a451..a61117652351 100644
--- a/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
+++ b/metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
@@ -6,7 +6,8 @@ HOMEPAGE=https://www.freedesktop.org/wiki/Software/uchardet/
 IUSE=cpu_flags_x86_sse2 static-libs test
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
 LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.6.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=582c1d6cc2eccb2eca156e537191b671
+_md5_=f0983c182d5476cb827d43e864f4f8dc
diff --git a/metadata/md5-cache/app-i18n/uchardet-9999 b/metadata/md5-cache/app-i18n/uchardet-9999
index 84b193536de5..518420d24856 100644
--- a/metadata/md5-cache/app-i18n/uchardet-9999
+++ b/metadata/md5-cache/app-i18n/uchardet-9999
@@ -6,6 +6,7 @@ HOMEPAGE=https://www.freedesktop.org/wiki/Software/uchardet/
 IUSE=cpu_flags_x86_sse2 static-libs test
 LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
 PROPERTIES=live
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c94ee6c97c68c1477914943b3a71c5df
+_md5_=08169f5c851a6aaace123c537c6ba249
diff --git a/metadata/md5-cache/app-misc/anki-2.1.0_beta25 b/metadata/md5-cache/app-misc/anki-2.1.0_beta25
index 7dbd12d8ea3e..1ae5499935bd 100644
--- a/metadata/md5-cache/app-misc/anki-2.1.0_beta25
+++ b/metadata/md5-cache/app-misc/anki-2.1.0_beta25
@@ -7,7 +7,8 @@ IUSE=latex +recording +sound test +python_targets_python3_6 +python_single_targe
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/PyQt5[gui,svg,webkit,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
 REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://apps.ankiweb.net/downloads/beta/anki-2.1.0beta25-source.tgz -> anki-2.1.0_beta25.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f065a4d27f75db9e0c5f3509c6b2db56
+_md5_=7fac44858ba247ac04dc675a8b52dbda
diff --git a/metadata/md5-cache/app-misc/anki-2.1.0_beta27 b/metadata/md5-cache/app-misc/anki-2.1.0_beta27
index e7324e33fcfa..4577bf6ddc66 100644
--- a/metadata/md5-cache/app-misc/anki-2.1.0_beta27
+++ b/metadata/md5-cache/app-misc/anki-2.1.0_beta27
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( ( >=dev-python/PyQt5-5.12[gui,svg,widgets,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQtWebEngine[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
 REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://apps.ankiweb.net/downloads/beta/anki-2.1.0beta27-source.tgz -> anki-2.1.0_beta27.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b55d37885cc09281a05bac8aeec0577
+_md5_=5523fe76fae11879b4dff6f8664c02c8
diff --git a/metadata/md5-cache/app-misc/anki-2.1.13 b/metadata/md5-cache/app-misc/anki-2.1.13
index be69c7723812..d66b3b9b0601 100644
--- a/metadata/md5-cache/app-misc/anki-2.1.13
+++ b/metadata/md5-cache/app-misc/anki-2.1.13
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( ( >=dev-python/PyQt5-5.12[gui,svg,widgets,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQtWebEngine[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] recording? ( media-sound/lame ) sound? ( media-video/mpv ) latex? ( app-text/texlive app-text/dvipng )
 REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://apps.ankiweb.net/downloads/current/anki-2.1.13-source.tgz -> anki-2.1.13.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5f715230d767c280f539aad18f97558
+_md5_=a105fc2af8c8d301098686d05623c917
diff --git a/metadata/md5-cache/app-misc/asciinema-2.0.2 b/metadata/md5-cache/app-misc/asciinema-2.0.2
index f210c19ce7c3..7477e76ba4aa 100644
--- a/metadata/md5-cache/app-misc/asciinema-2.0.2
+++ b/metadata/md5-cache/app-misc/asciinema-2.0.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciinema/asciinema/archive/v2.0.2.tar.gz -> asciinema-2.0.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a576f2c0ba1fa60846f6dbeb5db3403c
+_md5_=1d217e6fad92ce90782e4a216d85c497
diff --git a/metadata/md5-cache/app-misc/bgrep-0_p20110121-r1 b/metadata/md5-cache/app-misc/bgrep-0_p20110121-r1
index 2233107dcf02..4e77c213ba56 100644
--- a/metadata/md5-cache/app-misc/bgrep-0_p20110121-r1
+++ b/metadata/md5-cache/app-misc/bgrep-0_p20110121-r1
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/tmbinc/bgrep/
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmbinc/bgrep/tarball/49b098be9548d174023ad05c10f6af9d02b8e18e -> tmbinc-bgrep-49b098b.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=edc83924dc10184e82af34af34a09cd1
+_md5_=37d829bef16dcd46d347fd6b03c3e628
diff --git a/metadata/md5-cache/app-misc/chkcrontab-1.6 b/metadata/md5-cache/app-misc/chkcrontab-1.6
index ab284b6b14d7..6094fa03b7bf 100644
--- a/metadata/md5-cache/app-misc/chkcrontab-1.6
+++ b/metadata/md5-cache/app-misc/chkcrontab-1.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lyda/chkcrontab/archive/v1.6.tar.gz -> chkcrontab-1.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac2b8e503dbd992a691f44f66b5f9326
+_md5_=7eb7f419541143ec65733ddbf6b4394a
diff --git a/metadata/md5-cache/app-misc/chkcrontab-1.7 b/metadata/md5-cache/app-misc/chkcrontab-1.7
index b97020e9007f..1823d9abe46b 100644
--- a/metadata/md5-cache/app-misc/chkcrontab-1.7
+++ b/metadata/md5-cache/app-misc/chkcrontab-1.7
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lyda/chkcrontab/archive/v1.7.tar.gz -> chkcrontab-1.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a458c463c460a5b1639a434ebd93ae6f
+_md5_=7c431605a2804eddf95f004a35460ce7
diff --git a/metadata/md5-cache/app-misc/hatools-2.14 b/metadata/md5-cache/app-misc/hatools-2.14
index de8fbef78ab9..8ccc11154de3 100644
--- a/metadata/md5-cache/app-misc/hatools-2.14
+++ b/metadata/md5-cache/app-misc/hatools-2.14
@@ -5,6 +5,7 @@ HOMEPAGE=http://www.fatalmind.com/software/hatools/
 IUSE=test
 KEYWORDS=~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.fatalmind.com/software/hatools/hatools-2.14.tar.gz
-_md5_=10665cb47cf729056577724332a37262
+_md5_=17bc535f3a73e59fc8409495d2c08f1d
diff --git a/metadata/md5-cache/app-misc/khard-0.13.0 b/metadata/md5-cache/app-misc/khard-0.13.0
index d64b3148337b..6cf4391635b2 100644
--- a/metadata/md5-cache/app-misc/khard-0.13.0
+++ b/metadata/md5-cache/app-misc/khard-0.13.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64
 LICENSE=GPL-3
 RDEPEND=dev-python/atomicwrites[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ruamel-yaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unidecode[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >dev-python/vobject-0.9.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.13.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6a2585520b3de613f9dfd8837def0bad
+_md5_=dae8b8e802c23d376276f4cc59460683
diff --git a/metadata/md5-cache/app-misc/mosquitto-1.6.7 b/metadata/md5-cache/app-misc/mosquitto-1.6.7
index a70b6d58b477..4de7e66ad0c4 100644
--- a/metadata/md5-cache/app-misc/mosquitto-1.6.7
+++ b/metadata/md5-cache/app-misc/mosquitto-1.6.7
@@ -9,7 +9,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=EPL-1.0
 RDEPEND=acct-user/mosquitto acct-group/mosquitto srv? ( net-dns/c-ares:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcpd? ( sys-apps/tcp-wrappers )
 REQUIRED_USE=test? ( bridge )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mosquitto.org/files/source/mosquitto-1.6.7.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4afb4f44227710d0aaa1c706e32393f9
+_md5_=c2bbf97b2f7ce15a862a5e8723186823
diff --git a/metadata/md5-cache/app-misc/skim-0.5.2 b/metadata/md5-cache/app-misc/skim-0.5.2
index f55f2a28b295..418a32f4a22a 100644
--- a/metadata/md5-cache/app-misc/skim-0.5.2
+++ b/metadata/md5-cache/app-misc/skim-0.5.2
@@ -7,7 +7,8 @@ IUSE=tmux vim test debug
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lotabout/skim/archive/v0.5.2.tar.gz -> skim-0.5.2.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.10.2/download -> ansi_term-0.10.2.crate https://crates.io/api/v1/crates/atty/0.2.3/download -> atty-0.2.3.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/cc/1.0.17/download -> cc-1.0.17.crate https://crates.io/api/v1/crates/cfg-if/0.1.3/download -> cfg-if-0.1.3.crate https://crates.io/api/v1/crates/clap/2.28.0/download -> clap-2.28.0.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.32/download -> redox_syscall-0.1.32.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.3/download -> regex-0.2.3.crate https://crates.io/api/v1/crates/regex-syntax/0.4.1/download -> regex-syntax-0.4.1.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.4/download -> thread_local-0.3.4.crate https://crates.io/api/v1/crates/time/0.1.38/download -> time-0.1.38.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vec_map/0.8.0/download -> vec_map-0.8.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
 _eclasses_=cargo	72d5e7b3dd6b7132f6efc1973fabe4a3	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=1e7e033341b431f8f2e850afe3f8958e
+_md5_=0fd5bd1aec04c0757bba55f8336e9a06
diff --git a/metadata/md5-cache/app-misc/sphinx-2.1.9 b/metadata/md5-cache/app-misc/sphinx-2.1.9
index 79df0859490c..b4a24a076900 100644
--- a/metadata/md5-cache/app-misc/sphinx-2.1.9
+++ b/metadata/md5-cache/app-misc/sphinx-2.1.9
@@ -7,7 +7,8 @@ IUSE=debug id64 mysql odbc postgres stemmer syslog test xml
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) odbc? ( dev-db/unixODBC ) stemmer? ( dev-libs/snowball-stemmer ) xml? ( dev-libs/expat ) virtual/libiconv
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://sphinxsearch.com/files/sphinx-2.1.9-release.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_=bf639b8649664ababf568baaf26aa2b8
+_md5_=98073efcecf333304c0525abec59ae11
diff --git a/metadata/md5-cache/app-misc/todo-2.10-r2 b/metadata/md5-cache/app-misc/todo-2.10-r2
index f17414d7bbe4..ed1b6d37731d 100644
--- a/metadata/md5-cache/app-misc/todo-2.10-r2
+++ b/metadata/md5-cache/app-misc/todo-2.10-r2
@@ -6,7 +6,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-shells/bash
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ginatrapani/todo.txt-cli/archive/v2.10.tar.gz -> todo-2.10.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=25bf7ea3bd7458a0659d17d058e95633
+_md5_=148f4ad613115296365d3468165153d7
diff --git a/metadata/md5-cache/app-misc/tracker-miners-2.1.6 b/metadata/md5-cache/app-misc/tracker-miners-2.1.6
index fd7c5e735514..345de310cffe 100644
--- a/metadata/md5-cache/app-misc/tracker-miners-2.1.6
+++ b/metadata/md5-cache/app-misc/tracker-miners-2.1.6
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.1.0:= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) !gstreamer? ( ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) flac? ( >=media-libs/flac-1.2.1 ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) vorbis? ( >=media-libs/libvorbis-0.22 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) taglib? ( >=media-libs/taglib-1.6 ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
 REQUIRED_USE=cue? ( gstreamer )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/tracker-miners/2.1/tracker-miners-2.1.6.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=26e115ffbcaf15123c7d3cb5c744a083
+_md5_=d96b9b6749fe22030a1029a2eacb2374
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816 b/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816
index 8ee14bad40c1..f9e6332e9039 100644
--- a/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816
+++ b/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/andreafrancia/trash-cli/archive/5abecd53e1d84f2a5fd3fc60d2f5d71e518826c5.tar.gz -> trash-cli-0.17.1.14_p20170816.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68e2afd4b318b7b8fb25ae65c4bbfe9c
+_md5_=27cc04cc82ac443080dab1073bfed442
diff --git a/metadata/md5-cache/app-misc/unfoo-1.0.8 b/metadata/md5-cache/app-misc/unfoo-1.0.8
index 4eaee4c34af8..927b221391d1 100644
--- a/metadata/md5-cache/app-misc/unfoo-1.0.8
+++ b/metadata/md5-cache/app-misc/unfoo-1.0.8
@@ -7,6 +7,7 @@ IUSE=+minimal test
 KEYWORDS=amd64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!minimal? ( || ( app-arch/bzip2 app-arch/lbzip2[symlink] app-arch/pbzip2[symlink] ) || ( app-arch/gzip app-arch/pigz[symlink] ) app-arch/p7zip || ( app-arch/rar app-arch/unrar ) app-arch/unace app-arch/unzip app-arch/xz-utils )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jlec/unfoo/archive/v1.0.8.tar.gz -> unfoo-1.0.8.tar.gz
-_md5_=9cabfccf2f1312f19c39cb40453553d7
+_md5_=eff905feb99486ac54556f2f4dea83e7
diff --git a/metadata/md5-cache/app-misc/vlock-2.2.3-r1 b/metadata/md5-cache/app-misc/vlock-2.2.3-r1
index 3a81ebca9a61..204c27ff8819 100644
--- a/metadata/md5-cache/app-misc/vlock-2.2.3-r1
+++ b/metadata/md5-cache/app-misc/vlock-2.2.3-r1
@@ -7,7 +7,8 @@ IUSE=pam test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=!>=sys-apps/kbd-2.0.4-r1[pam] pam? ( sys-libs/pam )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/WorMzy/vlock/archive/f2afd55704bfe0a2d66e6b270d247e9b8a7b1664.tar.gz -> vlock-2.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2f4e411f95caa69ae518b8d0bb1387f
+_md5_=310a5d4455fab8ddbd0f80a3c8918203
diff --git a/metadata/md5-cache/app-misc/workrave-1.10.20 b/metadata/md5-cache/app-misc/workrave-1.10.20
index 49766d625165..711c3492c1ce 100644
--- a/metadata/md5-cache/app-misc/workrave-1.10.20
+++ b/metadata/md5-cache/app-misc/workrave-1.10.20
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?,X] >=dev-cpp/gtkmm-3.18.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 ayatana? ( >=dev-libs/libdbusmenu-0.4[gtk3,introspection] >=dev-libs/libindicator-0.4:3 ) gnome? ( >=gnome-base/gnome-shell-3.6.2 ) gstreamer? ( media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?] media-plugins/gst-plugins-meta:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) mate? ( mate-base/mate-applets ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) xfce? ( >=x11-libs/gtk+-2.6.0:2[introspection?] >=xfce-base/xfce4-panel-4.4 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu 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=ayatana? ( introspection ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rcaelers/workrave/archive/v1_10_20.tar.gz -> workrave-1.10.20.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a7cd079825ae2639f3d8bd3175bc2bd
+_md5_=2b699841eb3878fa14f2369c406d8ed0
diff --git a/metadata/md5-cache/app-office/dia2code-1.0.0 b/metadata/md5-cache/app-office/dia2code-1.0.0
index 95a81e760112..af838c04a5d1 100644
--- a/metadata/md5-cache/app-office/dia2code-1.0.0
+++ b/metadata/md5-cache/app-office/dia2code-1.0.0
@@ -6,7 +6,8 @@ HOMEPAGE=http://dia2code.sourceforge.net/
 IUSE=test
 KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-3+
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/dia2code/dia2code-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8730590a0e78dbf464a6dd99f5c574bd
+_md5_=809827857e7eaadf4e8f97d67d979631
diff --git a/metadata/md5-cache/app-portage/g-cpan-0.16.7 b/metadata/md5-cache/app-portage/g-cpan-0.16.7
index cf85be12177e..695d8b5ccf79 100644
--- a/metadata/md5-cache/app-portage/g-cpan-0.16.7
+++ b/metadata/md5-cache/app-portage/g-cpan-0.16.7
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=virtual/perl-File-Path virtual/perl-File-Spec dev-perl/Log-Agent virtual/perl-Memoize virtual/perl-IO dev-perl/Shell-EnvImporter virtual/perl-Term-ANSIColor >=dev-perl/YAML-0.60 >=sys-apps/portage-2.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gentoo-perl/g-cpan/releases/download/v0.16.7/g-cpan-0.16.7.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e568db0f0f22aa0fddc82bf1626361c5
+_md5_=04ebde8de96f4ad6e3d071bf0e9fbfae
diff --git a/metadata/md5-cache/app-portage/g-cpan-0.16.9-r1 b/metadata/md5-cache/app-portage/g-cpan-0.16.9-r1
index a38b3c65c3e6..a70dfca25fbf 100644
--- a/metadata/md5-cache/app-portage/g-cpan-0.16.9-r1
+++ b/metadata/md5-cache/app-portage/g-cpan-0.16.9-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=virtual/perl-File-Path virtual/perl-File-Spec dev-perl/Log-Agent virtual/perl-Memoize virtual/perl-IO dev-perl/Shell-EnvImporter virtual/perl-Term-ANSIColor >=dev-perl/YAML-0.60 >=sys-apps/portage-2.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gentoo-perl/g-cpan/archive/v0.16.9.tar.gz -> g-cpan-0.16.9.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0d191261d1c39a1ea901f9cb3b9234d5
+_md5_=342b95ce0a16ab95acd02f6a6878a15d
diff --git a/metadata/md5-cache/app-portage/g-cpan-9999 b/metadata/md5-cache/app-portage/g-cpan-9999
index 710371001031..9c167f197562 100644
--- a/metadata/md5-cache/app-portage/g-cpan-9999
+++ b/metadata/md5-cache/app-portage/g-cpan-9999
@@ -7,6 +7,7 @@ IUSE=test
 LICENSE=|| ( Artistic GPL-2 )
 PROPERTIES=live
 RDEPEND=dev-perl/Config-Tiny virtual/perl-File-Path virtual/perl-File-Spec dev-perl/Log-Agent virtual/perl-Memoize virtual/perl-IO dev-perl/Path-Tiny dev-perl/Shell-EnvImporter virtual/perl-Term-ANSIColor >=dev-perl/YAML-0.60 >=sys-apps/portage-2.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2cce97e30a9293c7459e287e137eb0ca
+_md5_=8ed338d4490e29b1336ba3d898feccde
diff --git a/metadata/md5-cache/app-portage/g-octave-0.4.1-r6 b/metadata/md5-cache/app-portage/g-octave-0.4.1-r6
index 377e2d333107..cff63d249a55 100644
--- a/metadata/md5-cache/app-portage/g-octave-0.4.1-r6
+++ b/metadata/md5-cache/app-portage/g-octave-0.4.1-r6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/portage python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/downloads/rafaelmartins/g-octave/g-octave-0.4.1.tar.gz https://github.com/rafaelmartins/g-octave-db/tarball/bdf02cbf0a8d017c6c1bddeffd6f03d5d90695ed -> g-octave-db-bdf02cb.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b6ca239cd1bfad72fa5b12f603de8d5
+_md5_=9ab8e8e36a0f119524380198051b2814
diff --git a/metadata/md5-cache/app-portage/layman-2.0.0-r1 b/metadata/md5-cache/app-portage/layman-2.0.0-r1
index 1a570c2e1ff5..34872ec83d8e 100644
--- a/metadata/md5-cache/app-portage/layman-2.0.0-r1
+++ b/metadata/md5-cache/app-portage/layman-2.0.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11f2d7de414d2df7a5f0fa1997b826e5
+_md5_=def8a7468553994b25b17bb1afe14dfc
diff --git a/metadata/md5-cache/app-portage/layman-2.0.0-r3 b/metadata/md5-cache/app-portage/layman-2.0.0-r3
index cb914e389930..1e8deb075f6d 100644
--- a/metadata/md5-cache/app-portage/layman-2.0.0-r3
+++ b/metadata/md5-cache/app-portage/layman-2.0.0-r3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 LICENSE=GPL-2
 RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=372703f05f395506a37c97af66249ebb
+_md5_=18b3968c26ead9356f34eeebf2f6b8d9
diff --git a/metadata/md5-cache/app-portage/layman-2.2.0-r7 b/metadata/md5-cache/app-portage/layman-2.2.0-r7
index 5af4839f37f5..e89f284d940e 100644
--- a/metadata/md5-cache/app-portage/layman-2.2.0-r7
+++ b/metadata/md5-cache/app-portage/layman-2.2.0-r7
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=GPL-2
 RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) g-sorcery? ( app-portage/g-sorcery ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/ssl-fetch-0.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0491378176f6ade9344f821b70633e0d
+_md5_=2d514a9b984fbf111216cca3d58d8000
diff --git a/metadata/md5-cache/app-portage/layman-2.4.1-r1 b/metadata/md5-cache/app-portage/layman-2.4.1-r1
index 026a0ca9e91f..8d63186a88df 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.1-r1
+++ b/metadata/md5-cache/app-portage/layman-2.4.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86
 LICENSE=GPL-2
 RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) g-sorcery? ( app-portage/g-sorcery ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) gpg? ( >=dev-python/pyGPG-0.2 ) sync-plugin-portage? ( >=sys-apps/portage-2.2.16[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) !sync-plugin-portage? ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) >=dev-python/ssl-fetch-0.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b03de2d88b5917f009e5c6b84b975b36
+_md5_=b76fc1727b110fe2a23cf240448c71ca
diff --git a/metadata/md5-cache/app-portage/layman-2.4.2-r1 b/metadata/md5-cache/app-portage/layman-2.4.2-r1
index 28e61f2237c0..05db3fa4961f 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.2-r1
+++ b/metadata/md5-cache/app-portage/layman-2.4.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-
 LICENSE=GPL-2
 RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) g-sorcery? ( app-portage/g-sorcery ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) gpg? ( >=dev-python/pyGPG-0.2 ) sync-plugin-portage? ( >=sys-apps/portage-2.2.16[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) !sync-plugin-portage? ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/ssl-fetch-0.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8514e57e5a0acebac39a53b49fae3b9d
+_md5_=2cb375d0cb4c94985ac6f9a8e9328bf8
diff --git a/metadata/md5-cache/app-portage/layman-2.4.2-r2 b/metadata/md5-cache/app-portage/layman-2.4.2-r2
index 10f9a378d134..a714ab467cf5 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.2-r2
+++ b/metadata/md5-cache/app-portage/layman-2.4.2-r2
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) g-sorcery? ( app-portage/g-sorcery ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) gpg? ( >=dev-python/pyGPG-0.2 ) sync-plugin-portage? ( >=sys-apps/portage-2.2.16[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) !sync-plugin-portage? ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/ssl-fetch-0.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3f4ab61bfe38be04fca2cfa035a11ce8
+_md5_=03ecf2abd7622a2c00e513d5e26f7acb
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index a583ba474814..ab4b87fd27ec 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -9,6 +9,7 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) g-sorcery? ( app-portage/g-sorcery ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) gpg? ( >=dev-python/pyGPG-0.2 ) sync-plugin-portage? ( >=sys-apps/portage-2.2.16[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) !sync-plugin-portage? ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/ssl-fetch-0.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3f4ab61bfe38be04fca2cfa035a11ce8
+_md5_=03ecf2abd7622a2c00e513d5e26f7acb
diff --git a/metadata/md5-cache/app-shells/bashdb-4.4.1.0.1 b/metadata/md5-cache/app-shells/bashdb-4.4.1.0.1
index 236cebb7d026..d77e835e01bd 100644
--- a/metadata/md5-cache/app-shells/bashdb-4.4.1.0.1
+++ b/metadata/md5-cache/app-shells/bashdb-4.4.1.0.1
@@ -6,6 +6,7 @@ HOMEPAGE=http://bashdb.sourceforge.net/
 IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/bashdb/bashdb-4.4-1.0.1.tar.bz2 test? ( https://dev.gentoo.org/~whissi/dist/bashdb/bashdb-4.4-1.0.0-missing-test-files.tar.xz )
-_md5_=5d6cb8cad8895bb188b73c81dbcd21fc
+_md5_=590759684342ef7ebafb20db47ccf348
diff --git a/metadata/md5-cache/app-shells/bashdb-5.0.1.1.0 b/metadata/md5-cache/app-shells/bashdb-5.0.1.1.0
index 3ead743f770d..2387f6ccf9da 100644
--- a/metadata/md5-cache/app-shells/bashdb-5.0.1.1.0
+++ b/metadata/md5-cache/app-shells/bashdb-5.0.1.1.0
@@ -6,6 +6,7 @@ HOMEPAGE=http://bashdb.sourceforge.net/
 IUSE=test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/bashdb/bashdb-5.0-1.1.0.tar.bz2 test? ( https://dev.gentoo.org/~whissi/dist/bashdb/bashdb-4.4-1.0.0-missing-test-files.tar.xz )
-_md5_=120e0a461c19417732236cd094d202a7
+_md5_=51d83f87f58c895e5bb836a4388c37f9
diff --git a/metadata/md5-cache/app-shells/fish-2.7.1 b/metadata/md5-cache/app-shells/fish-2.7.1
index 1f80c39c718d..614ad423ab45 100644
--- a/metadata/md5-cache/app-shells/fish-2.7.1
+++ b/metadata/md5-cache/app-shells/fish-2.7.1
@@ -7,6 +7,7 @@ IUSE=nls test
 KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre2-10.21[pcre32] sys-libs/ncurses:0=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/2.7.1/fish-2.7.1.tar.gz
-_md5_=da4cc1a10ef2b26e994aa6445f86c084
+_md5_=aca2269f59fc1dfbb4a85fecbc22d329
diff --git a/metadata/md5-cache/app-shells/fish-3.0.2 b/metadata/md5-cache/app-shells/fish-3.0.2
index af5f7dafab5f..e51f374287e4 100644
--- a/metadata/md5-cache/app-shells/fish-3.0.2
+++ b/metadata/md5-cache/app-shells/fish-3.0.2
@@ -8,7 +8,8 @@ IUSE=doc nls test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre2-10.21[pcre32] sys-devel/bc sys-libs/ncurses:0=[unicode]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.0.2/fish-3.0.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=10732da2173a960776ff59325b85758e
+_md5_=edfb5c3db2ab293bd917697e40fd9351
diff --git a/metadata/md5-cache/app-shells/fish-9999 b/metadata/md5-cache/app-shells/fish-9999
index 7f356946e1f6..82d4c6d3d747 100644
--- a/metadata/md5-cache/app-shells/fish-9999
+++ b/metadata/md5-cache/app-shells/fish-9999
@@ -8,6 +8,7 @@ IUSE=doc nls test
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-libs/ncurses:0=[unicode]
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c567b71135509caad9a598965e3e059
+_md5_=5f4e941b5a601887f260147d73b8107b
diff --git a/metadata/md5-cache/app-shells/fzy-1.0 b/metadata/md5-cache/app-shells/fzy-1.0
index 1321bdb07f9f..62fab639b797 100644
--- a/metadata/md5-cache/app-shells/fzy-1.0
+++ b/metadata/md5-cache/app-shells/fzy-1.0
@@ -5,7 +5,8 @@ HOMEPAGE=https://github.com/jhawthorn/fzy
 IUSE=test savedconfig
 KEYWORDS=amd64 arm arm64 ~ppc64 x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jhawthorn/fzy/releases/download/1.0/fzy-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d42fd096988222adf50e49c626846772
+_md5_=f010abc3961dd9e103a2e41c13d9b819
diff --git a/metadata/md5-cache/app-shells/fzy-9999 b/metadata/md5-cache/app-shells/fzy-9999
index 543a3ed2a602..e4c2f23594c8 100644
--- a/metadata/md5-cache/app-shells/fzy-9999
+++ b/metadata/md5-cache/app-shells/fzy-9999
@@ -6,6 +6,7 @@ HOMEPAGE=https://github.com/jhawthorn/fzy
 IUSE=test savedconfig
 LICENSE=MIT
 PROPERTIES=live
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=956c351c64c85fcc9a0ede0006e7ca0e
+_md5_=504dbfd3114b708b165730ff193f3cbd
diff --git a/metadata/md5-cache/app-shells/mksh-57-r1 b/metadata/md5-cache/app-shells/mksh-57-r1
index a9787973c3a6..2eeca0c2595d 100644
--- a/metadata/md5-cache/app-shells/mksh-57-r1
+++ b/metadata/md5-cache/app-shells/mksh-57-r1
@@ -7,7 +7,8 @@ IUSE=static test
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=static? ( dev-libs/klibc )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R57.tgz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6ce61af51f9e8aa4f6648a252887a3a6
+_md5_=5dbb0bc47e086eb2468280fbc9b2b575
diff --git a/metadata/md5-cache/app-shells/pdsh-2.26-r1 b/metadata/md5-cache/app-shells/pdsh-2.26-r1
index a21e26bd76c0..0a63af6ab063 100644
--- a/metadata/md5-cache/app-shells/pdsh-2.26-r1
+++ b/metadata/md5-cache/app-shells/pdsh-2.26-r1
@@ -7,6 +7,7 @@ IUSE=crypt readline rsh static-libs test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/pdsh/pdsh-2.26.tar.bz2
-_md5_=ad9b9b70066916df1b7f36d6ca88714a
+_md5_=24706c74fc4ea37ee1297295fb4de74c
diff --git a/metadata/md5-cache/app-shells/powerline-2.7 b/metadata/md5-cache/app-shells/powerline-2.7
index 7eb7068904ae..db3c2373cec5 100644
--- a/metadata/md5-cache/app-shells/powerline-2.7
+++ b/metadata/md5-cache/app-shells/powerline-2.7
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/powerline-status/powerline-status-2.7.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8db27524d81b54fa35606f10dde68f04
+_md5_=b73aa051b9e470448e431f71ce61dcb4
diff --git a/metadata/md5-cache/app-shells/powerline-9999 b/metadata/md5-cache/app-shells/powerline-9999
index d36732a013ae..89c7690a7e75 100644
--- a/metadata/md5-cache/app-shells/powerline-9999
+++ b/metadata/md5-cache/app-shells/powerline-9999
@@ -9,6 +9,7 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8db27524d81b54fa35606f10dde68f04
+_md5_=b73aa051b9e470448e431f71ce61dcb4
diff --git a/metadata/md5-cache/app-shells/thefuck-3.27 b/metadata/md5-cache/app-shells/thefuck-3.27
index 69d67d78aeb0..c19391769324 100644
--- a/metadata/md5-cache/app-shells/thefuck-3.27
+++ b/metadata/md5-cache/app-shells/thefuck-3.27
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/psutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/decorator[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/colorama[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyte[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nvbn/thefuck/archive/3.27.tar.gz -> thefuck-3.27.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=562c012ef79d9a8937feae1ecff8bdb9
+_md5_=226ef0e086e30d0e0df17e8bd2be5829
diff --git a/metadata/md5-cache/app-shells/thefuck-3.28 b/metadata/md5-cache/app-shells/thefuck-3.28
index a2f88bbfce47..4df8bb84bda0 100644
--- a/metadata/md5-cache/app-shells/thefuck-3.28
+++ b/metadata/md5-cache/app-shells/thefuck-3.28
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/psutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/decorator[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/colorama[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyte[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nvbn/thefuck/archive/3.28.tar.gz -> thefuck-3.28.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2ea99cadfe4e810a150e2b15d62a08a1
+_md5_=f73b24a62d1548e15993748628445414
diff --git a/metadata/md5-cache/app-shells/yash-2.48 b/metadata/md5-cache/app-shells/yash-2.48
index 583a3f20a285..40bb19b02f5f 100644
--- a/metadata/md5-cache/app-shells/yash-2.48
+++ b/metadata/md5-cache/app-shells/yash-2.48
@@ -7,7 +7,8 @@ IUSE=nls test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/yash/70439/yash-2.48.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8f26c594f2a682fddb231af5e2817559
+_md5_=56f03117cb4c539272977f074db01983
diff --git a/metadata/md5-cache/app-shells/yash-2.49 b/metadata/md5-cache/app-shells/yash-2.49
index e337092216e8..b3b8a6ee5193 100644
--- a/metadata/md5-cache/app-shells/yash-2.49
+++ b/metadata/md5-cache/app-shells/yash-2.49
@@ -7,7 +7,8 @@ IUSE=nls test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/yash/71638/yash-2.49.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4d4078315bab9f1b8d9bf16617f4d469
+_md5_=50211c4fe0549e36b8f02b0672c4bd34
diff --git a/metadata/md5-cache/app-text/XML-Schema-learner-1.0.1 b/metadata/md5-cache/app-text/XML-Schema-learner-1.0.1
index 294dcfd06842..b01617b5310d 100644
--- a/metadata/md5-cache/app-text/XML-Schema-learner-1.0.1
+++ b/metadata/md5-cache/app-text/XML-Schema-learner-1.0.1
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/php:*[cli,xml,xmlreader]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kore/XML-Schema-learner/archive/1.0.1.tar.gz -> XML-Schema-learner-1.0.1.tar.gz
-_md5_=866a2e6f07605846fbdc529391f0b575
+_md5_=445fa50e47a3112a8c843e16a64378a7
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016 b/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016
index 3b654afadf51..b560354e58a3 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh spa
 LICENSE=GPL-2
 RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2 python_single_target_pypy3? ( >=virtual/pypy3-5:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) graphviz? ( media-gfx/graphviz ) highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_pypy3(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/highlight ) )
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoc/asciidoc-py3/archive/618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0.tar.gz -> asciidoc-8.6.10_p20181016.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0c95bb271f7ea0471fa6e59357b3c883
+_md5_=944068ce61ffc02e8e2f52c1a6863a5b
diff --git a/metadata/md5-cache/app-text/blogc-0.18.0 b/metadata/md5-cache/app-text/blogc-0.18.0
index 3221b45c953c..337310e2a76f 100644
--- a/metadata/md5-cache/app-text/blogc-0.18.0
+++ b/metadata/md5-cache/app-text/blogc-0.18.0
@@ -7,6 +7,7 @@ IUSE=git httpd make test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=git? ( dev-vcs/git ) !dev-vcs/blogc-git-receiver !www-servers/blogc-runserver
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blogc/blogc/releases/download/v0.18.0/blogc-0.18.0.tar.xz
-_md5_=728a43cf652b4ac908a08e5cb5e9b991
+_md5_=928d947907214a22d2063851a3bd17b0
diff --git a/metadata/md5-cache/app-text/blogc-9999 b/metadata/md5-cache/app-text/blogc-9999
index 5496ff9512b4..6f2730842c58 100644
--- a/metadata/md5-cache/app-text/blogc-9999
+++ b/metadata/md5-cache/app-text/blogc-9999
@@ -7,6 +7,7 @@ IUSE=git httpd make test
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=git? ( dev-vcs/git ) !dev-vcs/blogc-git-receiver !www-servers/blogc-runserver
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=15539d2be1699b5e2eeead4a7f9f83d4
+_md5_=928d947907214a22d2063851a3bd17b0
diff --git a/metadata/md5-cache/app-text/cmark-0.29.0 b/metadata/md5-cache/app-text/cmark-0.29.0
index f3ab9ac21790..3a7a0352a138 100644
--- a/metadata/md5-cache/app-text/cmark-0.29.0
+++ b/metadata/md5-cache/app-text/cmark-0.29.0
@@ -7,7 +7,8 @@ HOMEPAGE=https://github.com/commonmark/cmark
 IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD-2
+RESTRICT=!test? ( test )
 SLOT=0/0.29.0
 SRC_URI=https://github.com/commonmark/cmark/archive/0.29.0.tar.gz -> cmark-0.29.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5831ae9cf412fd1d5e836374f9494b1
+_md5_=18862d4df551cf95a8d29ad6fab56c32
diff --git a/metadata/md5-cache/app-text/crm114-20100106-r1 b/metadata/md5-cache/app-text/crm114-20100106-r1
index 76ad42b68ce5..63d4c55dcbfc 100644
--- a/metadata/md5-cache/app-text/crm114-20100106-r1
+++ b/metadata/md5-cache/app-text/crm114-20100106-r1
@@ -7,7 +7,8 @@ IUSE=examples mew mimencode nls normalizemime static test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=static? ( dev-libs/tre[static-libs] ) !static? ( dev-libs/tre ) mew? ( app-emacs/mew ) mimencode? ( net-mail/metamail ) normalizemime? ( mail-filter/normalizemime )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://crm114.sourceforge.net/tarballs/crm114-20100106-BlameMichelson.src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d99a638c6ad68cf870cc90d323117b5
+_md5_=32fbe05034224c6f6dd3ef57e62bd0c1
diff --git a/metadata/md5-cache/app-text/discount-2.2.4 b/metadata/md5-cache/app-text/discount-2.2.4
index 647c35c18b82..97f6453d4891 100644
--- a/metadata/md5-cache/app-text/discount-2.2.4
+++ b/metadata/md5-cache/app-text/discount-2.2.4
@@ -5,7 +5,8 @@ HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
 IUSE=minimal test
 KEYWORDS=alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.4.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1ab968b552b92d61b06cd555d6cae2b8
+_md5_=0731243b8e7f4333059ceddbe2ee07f0
diff --git a/metadata/md5-cache/app-text/docbook2X-0.8.8-r4 b/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
index f91e5aaa693c..90f223bb97b1 100644
--- a/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
+++ b/metadata/md5-cache/app-text/docbook2X-0.8.8-r4
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XML-SAX dev-perl/XML-LibXML app-text/docbook-xsl-stylesheets =app-text/docbook-xml-dtd-4.2*
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook2x/docbook2X-0.8.8.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2cbf3ea9082ddaea2e0f9f1de4dd3c0
+_md5_=392f2bd4f9fa6dd893d6ea99013e4fb8
diff --git a/metadata/md5-cache/app-text/enchant-1.6.1 b/metadata/md5-cache/app-text/enchant-1.6.1
index 00ebcd4cc0c9..898c684c806e 100644
--- a/metadata/md5-cache/app-text/enchant-1.6.1
+++ b/metadata/md5-cache/app-text/enchant-1.6.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-l
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= )
 REQUIRED_USE=|| ( hunspell aspell )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7080b1d3748617b5c20d79fb247b5782
+_md5_=ed143e863ef4770d0ddb1bd3eaa362c2
diff --git a/metadata/md5-cache/app-text/enchant-1.6.1-r1 b/metadata/md5-cache/app-text/enchant-1.6.1-r1
index 3b112b938540..1ad632eed47b 100644
--- a/metadata/md5-cache/app-text/enchant-1.6.1-r1
+++ b/metadata/md5-cache/app-text/enchant-1.6.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-l
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= )
 REQUIRED_USE=|| ( hunspell aspell )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3f520e9262e96e7ff3351b5469037fba
+_md5_=ec1deb44bd20ad45aa55ae46289ff9f4
diff --git a/metadata/md5-cache/app-text/libebook-0.1.2-r1 b/metadata/md5-cache/app-text/libebook-0.1.2-r1
index b7bd5f69d7cb..655f7f2a30ce 100644
--- a/metadata/md5-cache/app-text/libebook-0.1.2-r1
+++ b/metadata/md5-cache/app-text/libebook-0.1.2-r1
@@ -7,7 +7,8 @@ IUSE=doc test tools
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/libebook/libe-book-0.1.2.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d6288f080dc7e8e38ad23b0eeb087c3e
+_md5_=9c2439f6043f5d95c89e2299ba872bd5
diff --git a/metadata/md5-cache/app-text/libebook-0.1.3 b/metadata/md5-cache/app-text/libebook-0.1.3
index 2702c87bbf04..8b7c714daa9d 100644
--- a/metadata/md5-cache/app-text/libebook-0.1.3
+++ b/metadata/md5-cache/app-text/libebook-0.1.3
@@ -7,7 +7,8 @@ IUSE=doc test tools
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=app-text/liblangtag dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/libebook/libe-book-0.1.3.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=210626f87ce2ebb90bd7bf441de5d100
+_md5_=9dab2a18b0e93daa7b657359a12162de
diff --git a/metadata/md5-cache/app-text/libepubgen-0.1.1 b/metadata/md5-cache/app-text/libepubgen-0.1.1
index 1fc65e07e95d..e85850014a01 100644
--- a/metadata/md5-cache/app-text/libepubgen-0.1.1
+++ b/metadata/md5-cache/app-text/libepubgen-0.1.1
@@ -7,6 +7,7 @@ IUSE=debug doc test
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/libepubgen/libepubgen-0.1.1.tar.xz
-_md5_=ff9ecfa018974a2cecb853e6c8e3a426
+_md5_=b02b4398a7e7d2e299060dec61f166b3
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.9 b/metadata/md5-cache/app-text/libetonyek-0.1.9
index eb0b0bcc0aec..d5df0174123f 100644
--- a/metadata/md5-cache/app-text/libetonyek-0.1.9
+++ b/metadata/md5-cache/app-text/libetonyek-0.1.9
@@ -7,6 +7,7 @@ IUSE=doc static-libs test
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 =dev-util/mdds-1.4*:1= sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.9.tar.xz
-_md5_=7bbd10ca9423943638671c6b5f33235a
+_md5_=634b1abf10a1b01122981d936f852a10
diff --git a/metadata/md5-cache/app-text/libetonyek-9999 b/metadata/md5-cache/app-text/libetonyek-9999
index ba0d1a08d1b5..c10e4fc56391 100644
--- a/metadata/md5-cache/app-text/libetonyek-9999
+++ b/metadata/md5-cache/app-text/libetonyek-9999
@@ -8,6 +8,7 @@ IUSE=doc static-libs test
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 PROPERTIES=live
 RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-1.4.3:1= sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=75a73540040b691c6218993a30d7f550
+_md5_=df9a36adeb7b4a9c169f05f20dd67bc4
diff --git a/metadata/md5-cache/app-text/libqxp-0.0.2 b/metadata/md5-cache/app-text/libqxp-0.0.2
index 3862707c5423..95b7e4225552 100644
--- a/metadata/md5-cache/app-text/libqxp-0.0.2
+++ b/metadata/md5-cache/app-text/libqxp-0.0.2
@@ -8,6 +8,7 @@ IUSE=debug doc test tools
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge dev-libs/icu:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libqxp/libqxp-0.0.2.tar.xz
-_md5_=4bf86724f6450ecb112a6f92d9a06d3d
+_md5_=9cc87d415717655805b1e64b10616d93
diff --git a/metadata/md5-cache/app-text/libxmlpatch-0.3.3 b/metadata/md5-cache/app-text/libxmlpatch-0.3.3
index c6d82c1cb3c9..6145e2996c5c 100644
--- a/metadata/md5-cache/app-text/libxmlpatch-0.3.3
+++ b/metadata/md5-cache/app-text/libxmlpatch-0.3.3
@@ -7,7 +7,8 @@ IUSE=test static-libs
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlpatch/libxmlpatch-0.3.3.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_=8464f6d558a54b9ffa44a988a23f4f98
+_md5_=9c77eb886daa9bce79fa7a4339fbac68
diff --git a/metadata/md5-cache/app-text/mftrace-1.2.18-r3 b/metadata/md5-cache/app-text/mftrace-1.2.18-r3
index 01093f74c182..31d8388d89ef 100644
--- a/metadata/md5-cache/app-text/mftrace-1.2.18-r3
+++ b/metadata/md5-cache/app-text/mftrace-1.2.18-r3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge ) virtual/latex-base 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 )
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=http://lilypond.org/downloads/sources/mftrace/mftrace-1.2.18.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=994de2ec0bd1653040bacac1bbf37e0d
+_md5_=5b6510860004761a6d2f499cb231e568
diff --git a/metadata/md5-cache/app-text/mftrace-1.2.19-r1 b/metadata/md5-cache/app-text/mftrace-1.2.19-r1
index 8cbc497838ec..77ff6098ca19 100644
--- a/metadata/md5-cache/app-text/mftrace-1.2.19-r1
+++ b/metadata/md5-cache/app-text/mftrace-1.2.19-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge ) virtual/latex-base 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 )
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=http://lilypond.org/downloads/sources/mftrace/mftrace-1.2.19.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bc77484352fc336a79747a864203eb14
+_md5_=bd34780899e702e9fa25391f8420769b
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r3 b/metadata/md5-cache/app-text/opensp-1.5.2-r3
index 6a1d6bf5533d..a916ea2fcf4d 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r3
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r3
@@ -7,7 +7,8 @@ IUSE=doc nls static-libs test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=net-libs/libnsl:0=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52493b5e20ee96a09c2764f6dde1760d
+_md5_=a7e716daed1af4e93fc66bf8eafcd756
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r6 b/metadata/md5-cache/app-text/opensp-1.5.2-r6
index 0c18b4d09a5b..b2013c8235bf 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r6
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r6
@@ -7,7 +7,8 @@ IUSE=doc elibc_glibc nls static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=elibc_glibc? ( net-libs/libnsl:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6dfed896786e8236737843cb09f1d19e
+_md5_=5f3f93da83028e30fb3640c010fd4bea
diff --git a/metadata/md5-cache/app-text/pdf2djvu-0.9.11 b/metadata/md5-cache/app-text/pdf2djvu-0.9.11
index 956a13115100..9e6fd85981c8 100644
--- a/metadata/md5-cache/app-text/pdf2djvu-0.9.11
+++ b/metadata/md5-cache/app-text/pdf2djvu-0.9.11
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.21:= >=app-text/poppler-0.16.7:= dev-libs/libxml2:= dev-libs/libxslt:= graphicsmagick? ( media-gfx/graphicsmagick:= )
 REQUIRED_USE=test? ( graphicsmagick )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jwilk/pdf2djvu/releases/download/0.9.11/pdf2djvu-0.9.11.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fca58019664b7dc45559b082f50a12c0
+_md5_=31202c7fa4f7ddcfe20eacff03e93d27
diff --git a/metadata/md5-cache/app-text/pdf2djvu-0.9.12 b/metadata/md5-cache/app-text/pdf2djvu-0.9.12
index c3ded0fa8c24..afa060c85e6e 100644
--- a/metadata/md5-cache/app-text/pdf2djvu-0.9.12
+++ b/metadata/md5-cache/app-text/pdf2djvu-0.9.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.21:= >=app-text/poppler-0.16.7:= dev-libs/libxml2:= dev-libs/libxslt:= graphicsmagick? ( media-gfx/graphicsmagick:= )
 REQUIRED_USE=test? ( graphicsmagick )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jwilk/pdf2djvu/releases/download/0.9.12/pdf2djvu-0.9.12.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=eff2c51dcff11a7c0159691f4dea535b
+_md5_=1b7432b67ac7fe7294ce6c5e7c53b8d0
diff --git a/metadata/md5-cache/app-text/pdf2djvu-0.9.8 b/metadata/md5-cache/app-text/pdf2djvu-0.9.8
index 3a416910cf96..42be70b222c7 100644
--- a/metadata/md5-cache/app-text/pdf2djvu-0.9.8
+++ b/metadata/md5-cache/app-text/pdf2djvu-0.9.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.21:= >=app-text/poppler-0.16.7:= dev-libs/libxml2:= dev-libs/libxslt:= graphicsmagick? ( media-gfx/graphicsmagick:= )
 REQUIRED_USE=test? ( graphicsmagick )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jwilk/pdf2djvu/releases/download/0.9.8/pdf2djvu-0.9.8.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4ba55d30a669eabf52fc433922674eb4
+_md5_=5b329b9c5ad3e4de4d95bb32a11410ae
diff --git a/metadata/md5-cache/app-text/pdfgrep-1.4.1-r1 b/metadata/md5-cache/app-text/pdfgrep-1.4.1-r1
index 88aeddd22ae4..47a1bfaff90e 100644
--- a/metadata/md5-cache/app-text/pdfgrep-1.4.1-r1
+++ b/metadata/md5-cache/app-text/pdfgrep-1.4.1-r1
@@ -7,6 +7,7 @@ IUSE=+pcre test unac
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/poppler:=[cxx] pcre? ( dev-libs/libpcre[cxx] ) unac? ( app-text/unac )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pdfgrep.org/download/pdfgrep-1.4.1.tar.gz
-_md5_=daa1f29455f9774e8d3d29fcd56de49e
+_md5_=cd79fca03046df1b01e491c391b32897
diff --git a/metadata/md5-cache/app-text/pdfgrep-2.0.1 b/metadata/md5-cache/app-text/pdfgrep-2.0.1
index 677e6283909d..506c3ca49236 100644
--- a/metadata/md5-cache/app-text/pdfgrep-2.0.1
+++ b/metadata/md5-cache/app-text/pdfgrep-2.0.1
@@ -7,6 +7,7 @@ IUSE=+pcre test unac
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/poppler:=[cxx] dev-libs/libgcrypt:0= pcre? ( dev-libs/libpcre[cxx] ) unac? ( app-text/unac )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.pdfgrep.org/download/pdfgrep-2.0.1.tar.gz
-_md5_=f8bcbd1621a3b4461f6a4d93b5e04ccf
+_md5_=32999bfc4b1e2b63864f6bd78510ea3b
diff --git a/metadata/md5-cache/app-text/pdfgrep-2.1.2 b/metadata/md5-cache/app-text/pdfgrep-2.1.2
index 26033f2fc456..bf37079cc5d3 100644
--- a/metadata/md5-cache/app-text/pdfgrep-2.1.2
+++ b/metadata/md5-cache/app-text/pdfgrep-2.1.2
@@ -8,6 +8,7 @@ IUSE=+pcre test unac
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-text/poppler:=[cxx] dev-libs/libgcrypt:0= pcre? ( dev-libs/libpcre[cxx] ) unac? ( app-text/unac )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.pdfgrep.org/download/pdfgrep-2.1.2.tar.gz
-_md5_=32207d16e2cd06bcfdd2e65ae75460e9
+_md5_=bbc94bdc3ee162a2d0f8eebc5245ad2a
diff --git a/metadata/md5-cache/app-text/pdfminer-20140328-r1 b/metadata/md5-cache/app-text/pdfminer-20140328-r1
index 8b1d7f936acb..459d7a974cd6 100644
--- a/metadata/md5-cache/app-text/pdfminer-20140328-r1
+++ b/metadata/md5-cache/app-text/pdfminer-20140328-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20140328.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24a09b3fef06f4619420327b3996a8a9
+_md5_=28e9f9501354b7bb85c88f15112647de
diff --git a/metadata/md5-cache/app-text/pdfminer-20191020 b/metadata/md5-cache/app-text/pdfminer-20191020
index a028a07b98c5..0e8d489f7c56 100644
--- a/metadata/md5-cache/app-text/pdfminer-20191020
+++ b/metadata/md5-cache/app-text/pdfminer-20191020
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pycryptodome[python_targets_pypy(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20191020.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=abc2f7412c50cdc1fcb25ec677019d2c
+_md5_=8b11156d6e2ba65b21474ce0d11d9777
diff --git a/metadata/md5-cache/app-text/peg-markdown-0.4.14 b/metadata/md5-cache/app-text/peg-markdown-0.4.14
index fae10f6e4534..3c11cc27fb2a 100644
--- a/metadata/md5-cache/app-text/peg-markdown-0.4.14
+++ b/metadata/md5-cache/app-text/peg-markdown-0.4.14
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( GPL-2 MIT )
 RDEPEND=dev-libs/glib:2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jgm/peg-markdown/archive/0.4.14.tar.gz -> peg-markdown-0.4.14.tar.gz
-_md5_=86709aa218ce602faef44de69a5d84b0
+_md5_=8593e37cc9ed30aa3d69ceee37ef2cf0
diff --git a/metadata/md5-cache/app-text/pelican-3.7.1 b/metadata/md5-cache/app-text/pelican-3.7.1
index 2f684f78190b..9343f928830d 100644
--- a/metadata/md5-cache/app-text/pelican-3.7.1
+++ b/metadata/md5-cache/app-text/pelican-3.7.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=AGPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/3.7.1.tar.gz -> pelican-3.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb547444ac304675027ca4627e2ccd70
+_md5_=3df0098c29c93ffb961351358321a1b0
diff --git a/metadata/md5-cache/app-text/po4a-0.47-r1 b/metadata/md5-cache/app-text/po4a-0.47-r1
index a3d5832b4dc0..af23b71ae3d5 100644
--- a/metadata/md5-cache/app-text/po4a-0.47-r1
+++ b/metadata/md5-cache/app-text/po4a-0.47-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N sys-devel/gettext dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/po4a/po4a_0.47.orig.tar.gz
 _eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f9c706381f9b24e19b7fb3ae98acc055
+_md5_=ac912327b9456aec9cf823cce71f8fec
diff --git a/metadata/md5-cache/app-text/po4a-0.55 b/metadata/md5-cache/app-text/po4a-0.55
index 8fab85da1233..65317879ffa4 100644
--- a/metadata/md5-cache/app-text/po4a-0.55
+++ b/metadata/md5-cache/app-text/po4a-0.55
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.55/po4a-0.55.tar.gz
 _eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9df8cff1042d1919cee807b24d13b171
+_md5_=aed749cd4113be1efb3b10be9a1b6e3d
diff --git a/metadata/md5-cache/app-text/po4a-0.56 b/metadata/md5-cache/app-text/po4a-0.56
index d9e780dd50ba..dfe254ea6150 100644
--- a/metadata/md5-cache/app-text/po4a-0.56
+++ b/metadata/md5-cache/app-text/po4a-0.56
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.56/po4a-0.56.tar.gz
 _eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e599f84968ee0193be0fffc50e207b20
+_md5_=a89320260106d56d9e78b0273caed5ac
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_p20180715 b/metadata/md5-cache/app-text/podofo-0.9.6_p20180715
index e46b6728b2c6..57757f2447af 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_p20180715
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_p20180715
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
 SLOT=0/0.9.6
 SRC_URI=mirror://gentoo/podofo-0.9.6_p20180715.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1da2a15d031f41f6bfb97d2fe1da81d2
+_md5_=253ab0c306184793626e5272c754608f
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_pre20170508-r1 b/metadata/md5-cache/app-text/podofo-0.9.6_pre20170508-r1
index 1fe97c4e5078..82c462a02f61 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_pre20170508-r1
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_pre20170508-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
 SLOT=0/0.9.6_pre20170508-r1
 SRC_URI=mirror://gentoo/podofo-0.9.6_pre20170508.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5b8ed096f81153167380cfab067d2b7
+_md5_=aca568da106b7526983b14607aec181b
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_pre20171027 b/metadata/md5-cache/app-text/podofo-0.9.6_pre20171027
index e82045ff8a99..550fd8fa8806 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_pre20171027
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_pre20171027
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
 SLOT=0/0.9.6_pre20171027
 SRC_URI=mirror://gentoo/podofo-0.9.6_pre20171027.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05e0bd4aa9c5b7809e8a05492508febb
+_md5_=fa6f00212d3ea750770bc663a4658c63
diff --git a/metadata/md5-cache/app-text/pytextile-2.3.3 b/metadata/md5-cache/app-text/pytextile-2.3.3
index 21a3783d9c3e..ee37347f1a96 100644
--- a/metadata/md5-cache/app-text/pytextile-2.3.3
+++ b/metadata/md5-cache/app-text/pytextile-2.3.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/regex[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/textile/python-textile/archive/2.3.3.tar.gz -> pytextile-2.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5148102f4286d7a3a60de881c2651b95
+_md5_=763814608813421066d8114098ba8360
diff --git a/metadata/md5-cache/app-text/pytextile-3.0.3 b/metadata/md5-cache/app-text/pytextile-3.0.3
index 945cdbb8e82c..74202a4e5804 100644
--- a/metadata/md5-cache/app-text/pytextile-3.0.3
+++ b/metadata/md5-cache/app-text/pytextile-3.0.3
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/html5lib[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/regex[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/textile/python-textile/archive/3.0.3.tar.gz -> pytextile-3.0.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5f1484881a9dd8e7977df0b1bb252dfe
+_md5_=908876dc4bafe159f1a69a8fa4d27196
diff --git a/metadata/md5-cache/app-text/referencer-1.2.2-r1 b/metadata/md5-cache/app-text/referencer-1.2.2-r1
index 3b9297446b80..32f9d04e11b0 100644
--- a/metadata/md5-cache/app-text/referencer-1.2.2-r1
+++ b/metadata/md5-cache/app-text/referencer-1.2.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/poppler-0.12.3-r3[cairo] >=dev-cpp/gtkmm-2.8:2.4 >=dev-cpp/libglademm-2.6.0 >=dev-cpp/gconfmm-2.14.0 >=dev-libs/boost-1.52.0-r4:=
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/referencer/1./1.2.2/+download/referencer-1.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=21d33290d5bf8c4a97ec00fc038c8c95
+_md5_=fc9178371a6aa93f6a9139626409dee0
diff --git a/metadata/md5-cache/app-text/sdcv-0.5.2 b/metadata/md5-cache/app-text/sdcv-0.5.2
index a62e3a4cab37..044708b92857 100644
--- a/metadata/md5-cache/app-text/sdcv-0.5.2
+++ b/metadata/md5-cache/app-text/sdcv-0.5.2
@@ -7,7 +7,8 @@ IUSE=darkterm nls readline test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6.1 sys-libs/zlib readline? ( sys-libs/readline:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Dushistov/sdcv/archive/v0.5.2.tar.gz -> sdcv-0.5.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e9a6eb9e16a450ad8e1c6dd4f9bff52
+_md5_=bdc1bedf2d242dfa4cf92d512e0027d8
diff --git a/metadata/md5-cache/app-text/unac-1.8.0 b/metadata/md5-cache/app-text/unac-1.8.0
index b082e9228c16..148e9973866f 100644
--- a/metadata/md5-cache/app-text/unac-1.8.0
+++ b/metadata/md5-cache/app-text/unac-1.8.0
@@ -7,7 +7,8 @@ IUSE=static-libs test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=virtual/libiconv
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/u/unac/unac_1.8.0.orig.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_=bbd524763bd50603a3c3839c4f45e326
+_md5_=b979958391e06ac583d7df6959cbd4fa
diff --git a/metadata/md5-cache/app-text/wdiff-1.2.2 b/metadata/md5-cache/app-text/wdiff-1.2.2
index aed1b6677558..3479643b2fc5 100644
--- a/metadata/md5-cache/app-text/wdiff-1.2.2
+++ b/metadata/md5-cache/app-text/wdiff-1.2.2
@@ -7,6 +7,7 @@ IUSE=experimental test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wdiff/wdiff-1.2.2.tar.gz
-_md5_=a94ef90183920e08cf8f5f71c225ec60
+_md5_=66b51a5e064787e16abb0fe87e44b3ac
diff --git a/metadata/md5-cache/app-text/wdiff-1.2.2-r1 b/metadata/md5-cache/app-text/wdiff-1.2.2-r1
index a27e62c47c3d..22ddabef938f 100644
--- a/metadata/md5-cache/app-text/wdiff-1.2.2-r1
+++ b/metadata/md5-cache/app-text/wdiff-1.2.2-r1
@@ -7,6 +7,7 @@ IUSE=experimental test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:0=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wdiff/wdiff-1.2.2.tar.gz
-_md5_=48a6a875c7052d29935aac609d385d79
+_md5_=af23ae82da14790b731f6d7095f4fa5a
diff --git a/metadata/md5-cache/app-vim/youcompleteme-20130910 b/metadata/md5-cache/app-vim/youcompleteme-20130910
index c7dfdea4ed50..bab8d91fa9f6 100644
--- a/metadata/md5-cache/app-vim/youcompleteme-20130910
+++ b/metadata/md5-cache/app-vim/youcompleteme-20130910
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) clang? ( >=sys-devel/clang-3.3 ) || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/vim/youcompleteme-20130910.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a3fb258035ce35d52d68b7b6405b03b2
+_md5_=335863a6ff84e754251ffecd845ec943
diff --git a/metadata/md5-cache/app-vim/youcompleteme-99999999 b/metadata/md5-cache/app-vim/youcompleteme-99999999
index a1963af4a156..cca9461bea0a 100644
--- a/metadata/md5-cache/app-vim/youcompleteme-99999999
+++ b/metadata/md5-cache/app-vim/youcompleteme-99999999
@@ -8,6 +8,7 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) clang? ( >=sys-devel/clang-3.3 ) dev-libs/boost[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/bottle[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/sh[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/waitress[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a02867f107d14fc6cecdc1cce308275e
+_md5_=abf9621769f57bfe1e2cbc384281143c
diff --git a/metadata/md5-cache/dev-cpp/asio-1.10.8 b/metadata/md5-cache/dev-cpp/asio-1.10.8
index 1b4c0b84d3e0..bbd7eb6b5f16 100644
--- a/metadata/md5-cache/dev-cpp/asio-1.10.8
+++ b/metadata/md5-cache/dev-cpp/asio-1.10.8
@@ -7,6 +7,7 @@ IUSE=doc examples ssl test
 KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost ssl? ( dev-libs/openssl:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asio/asio/asio-1.10.8.tar.bz2
-_md5_=c58cb28c2f6b035276c8f68e14c8bc53
+_md5_=7392948d928b2e18c7a3c656f98d71df
diff --git a/metadata/md5-cache/dev-cpp/asio-1.12.2 b/metadata/md5-cache/dev-cpp/asio-1.12.2
index 891aef8f097a..ba38f6094915 100644
--- a/metadata/md5-cache/dev-cpp/asio-1.12.2
+++ b/metadata/md5-cache/dev-cpp/asio-1.12.2
@@ -7,6 +7,7 @@ IUSE=doc examples libressl ssl test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asio/asio/asio-1.12.2.tar.bz2
-_md5_=3122c29f746d13100a84dc0eccdbfb26
+_md5_=5514a5a6ad83b2bd6ab5a8bb93e054a4
diff --git a/metadata/md5-cache/dev-cpp/asio-1.13.0 b/metadata/md5-cache/dev-cpp/asio-1.13.0
index 6fc2592efaa4..7802abd9faa1 100644
--- a/metadata/md5-cache/dev-cpp/asio-1.13.0
+++ b/metadata/md5-cache/dev-cpp/asio-1.13.0
@@ -7,6 +7,7 @@ IUSE=doc examples libressl ssl test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asio/asio/asio-1.13.0.tar.bz2
-_md5_=3122c29f746d13100a84dc0eccdbfb26
+_md5_=5514a5a6ad83b2bd6ab5a8bb93e054a4
diff --git a/metadata/md5-cache/dev-cpp/asio-1.14.0 b/metadata/md5-cache/dev-cpp/asio-1.14.0
index 6c09dece3bda..3b288f6b35c0 100644
--- a/metadata/md5-cache/dev-cpp/asio-1.14.0
+++ b/metadata/md5-cache/dev-cpp/asio-1.14.0
@@ -7,6 +7,7 @@ IUSE=doc examples libressl ssl test
 KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asio/asio/asio-1.14.0.tar.bz2
-_md5_=48bdf20371127649c6d582ad0ad6b590
+_md5_=e61d5515568dffea20106864075e4598
diff --git a/metadata/md5-cache/dev-cpp/cpp-hocon-0.1.4-r1 b/metadata/md5-cache/dev-cpp/cpp-hocon-0.1.4-r1
index 4023ef2701ab..b459e729c1ea 100644
--- a/metadata/md5-cache/dev-cpp/cpp-hocon-0.1.4-r1
+++ b/metadata/md5-cache/dev-cpp/cpp-hocon-0.1.4-r1
@@ -7,7 +7,8 @@ IUSE=debug test
 KEYWORDS=amd64 ~arm hppa ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=sys-devel/gcc-4.9.3:* >=dev-libs/boost-1.54:=[nls] >=dev-libs/leatherman-0.9.3:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/cpp-hocon/archive/0.1.4.tar.gz -> cpp-hocon-0.1.4.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c48c1c543fcfcbbde2cc5c769808731
+_md5_=fd3a2950a77a13f7ac67e10c3f64362a
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.0 b/metadata/md5-cache/dev-cpp/gflags-2.2.0
index 24724fe4696a..16af81025685 100644
--- a/metadata/md5-cache/dev-cpp/gflags-2.2.0
+++ b/metadata/md5-cache/dev-cpp/gflags-2.2.0
@@ -6,7 +6,8 @@ HOMEPAGE=http://gflags.github.io/gflags/
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0/2.2
 SRC_URI=https://github.com/gflags/gflags/archive/v2.2.0.tar.gz -> gflags-2.2.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9810fc7c6bd68d4f5ec918bf90f96108
+_md5_=782f49859e5ffee8a7a8b44aec84f835
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.1 b/metadata/md5-cache/dev-cpp/gflags-2.2.1
index c9275e4ac7f1..cc28a755199b 100644
--- a/metadata/md5-cache/dev-cpp/gflags-2.2.1
+++ b/metadata/md5-cache/dev-cpp/gflags-2.2.1
@@ -6,7 +6,8 @@ HOMEPAGE=http://gflags.github.io/gflags/
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0/2.2
 SRC_URI=https://github.com/gflags/gflags/archive/v2.2.1.tar.gz -> gflags-2.2.1.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=73cd89372f1f6349670580170790163c
+_md5_=36f62cf13fae8488cc9b7e4dc973021d
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.1-r1 b/metadata/md5-cache/dev-cpp/gflags-2.2.1-r1
index 5853c29d9cc3..7e854d2f6346 100644
--- a/metadata/md5-cache/dev-cpp/gflags-2.2.1-r1
+++ b/metadata/md5-cache/dev-cpp/gflags-2.2.1-r1
@@ -6,7 +6,8 @@ HOMEPAGE=http://gflags.github.io/gflags/
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0/2.2
 SRC_URI=https://github.com/gflags/gflags/archive/v2.2.1.tar.gz -> gflags-2.2.1.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c404902c9f21e2829e01e9d33ecc93e
+_md5_=1ecc8d08dd80723eb2987fb498496f39
diff --git a/metadata/md5-cache/dev-cpp/gflags-9999 b/metadata/md5-cache/dev-cpp/gflags-9999
index ed4df7d76270..856a11f88329 100644
--- a/metadata/md5-cache/dev-cpp/gflags-9999
+++ b/metadata/md5-cache/dev-cpp/gflags-9999
@@ -6,6 +6,7 @@ HOMEPAGE=http://gflags.github.io/gflags/
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 LICENSE=BSD
 PROPERTIES=live
+RESTRICT=!test? ( test )
 SLOT=0/2.2
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79737fd3904dc1a67f9534d510a3781c
+_md5_=5b5b7c091655dddeb6329b25bfae822c
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.56.1 b/metadata/md5-cache/dev-cpp/glibmm-2.56.1
index 98eb233b73d2..7d13f87541d0 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.56.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.56.1
@@ -7,7 +7,8 @@ IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.55.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.56/glibmm-2.56.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c596e91a7b234ccecc3500fc14adba83
+_md5_=05da06ee39d8d16c60d521f134669638
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.58.1 b/metadata/md5-cache/dev-cpp/glibmm-2.58.1
index 3bc701949baa..3dd895f5ce55 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.58.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.58.1
@@ -7,7 +7,8 @@ IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.55.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.58/glibmm-2.58.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82ef71829e9ee1a4bd5f9346e63fa7e6
+_md5_=51171e42a50c5d9787d276bcebf2c49f
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.60.0 b/metadata/md5-cache/dev-cpp/glibmm-2.60.0
index ecb00eb424fa..dc45463377d4 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.60.0
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.60.0
@@ -7,7 +7,8 @@ IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.59.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.60/glibmm-2.60.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f805f68b9f3d5c659e79feee1776c9df
+_md5_=d644435da0a9053f18f03075f150b63d
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.60.1 b/metadata/md5-cache/dev-cpp/glibmm-2.60.1
index ce9a79a743c9..ccfc5dabc649 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.60.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.60.1
@@ -7,7 +7,8 @@ IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.59.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.60/glibmm-2.60.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df5c51b61ac447f5f6066006ad28d1c6
+_md5_=5315898ac7b0d76f8dce809126c7e9c3
diff --git a/metadata/md5-cache/dev-cpp/gstreamermm-1.10.0 b/metadata/md5-cache/dev-cpp/gstreamermm-1.10.0
index 22f0a3da6737..76a70ab0a1c7 100644
--- a/metadata/md5-cache/dev-cpp/gstreamermm-1.10.0
+++ b/metadata/md5-cache/dev-cpp/gstreamermm-1.10.0
@@ -7,7 +7,8 @@ IUSE=doc examples test test
 KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/gstreamer-1.10.0:1.0 >=media-libs/gst-plugins-base-1.10.0:1.0 >=dev-cpp/glibmm-2.47.6:2 >=dev-cpp/libxmlpp-2.14:2.6 >=dev-libs/libsigc++-2:2
+RESTRICT=!test? ( test )
 SLOT=1.0/1
 SRC_URI=mirror://gnome/sources/gstreamermm/1.10/gstreamermm-1.10.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d61505c6c7c4129620b53b50fc3b6a3
+_md5_=594dcd0d5219f9ccd1d61f52f059ab88
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.10.0 b/metadata/md5-cache/dev-cpp/gtest-1.10.0
index 4910efa1e092..e04be056e467 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.10.0
+++ b/metadata/md5-cache/dev-cpp/gtest-1.10.0
@@ -8,7 +8,8 @@ IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/v1.10.x.tar.gz -> gtest-1.10.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2361c14297dccf99804d8fffa181e9ec
+_md5_=145700d9c1d834ce1a2187595cc94b43
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.8.0 b/metadata/md5-cache/dev-cpp/gtest-1.8.0
index 1a2079f3a192..4fdb5f8094b9 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.8.0
+++ b/metadata/md5-cache/dev-cpp/gtest-1.8.0
@@ -7,7 +7,8 @@ IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a451f1f6eba41503994f5e9e5171599
+_md5_=d9e7ed483c7a56c0134426b1086eaaec
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1 b/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
index 4e42a10af048..1bd17da89f20 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
+++ b/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
@@ -7,7 +7,8 @@ IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a8b33d2e6eb32383a0d1e09443ff808
+_md5_=b13b01e6d9cba241a0304ff149363554
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.8.1 b/metadata/md5-cache/dev-cpp/gtest-1.8.1
index 09aca3d86af3..246e2c9e9bc6 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.8.1
+++ b/metadata/md5-cache/dev-cpp/gtest-1.8.1
@@ -7,7 +7,8 @@ IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/release-1.8.1.tar.gz -> gtest-1.8.1.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b6a359c3b80b7e41d801e9d77a7ab2fa
+_md5_=8338d1bc9ad98f121e990788986c41eb
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.8.1-r1 b/metadata/md5-cache/dev-cpp/gtest-1.8.1-r1
index 143b936c17c4..4425fed1c462 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.8.1-r1
+++ b/metadata/md5-cache/dev-cpp/gtest-1.8.1-r1
@@ -8,7 +8,8 @@ IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/release-1.8.1.tar.gz -> gtest-1.8.1.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60837163f437989fa0c4dbeba731cfcb
+_md5_=b05ad04030c2e2768292ed28656612bb
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607 b/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607
index 1778b574bae3..d15b2941a851 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607
+++ b/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607
@@ -8,7 +8,8 @@ IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/da10da05c262af0a9e8fa91789a272a3dec67655.tar.gz -> gtest-1.9.0_pre20190607.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=70c848b942f9b9f3fed9323a58155e61
+_md5_=da5d738c7580fd6b61900c0558a21489
diff --git a/metadata/md5-cache/dev-cpp/gtest-9999 b/metadata/md5-cache/dev-cpp/gtest-9999
index 46a94d1d2cb0..5609ef06c146 100644
--- a/metadata/md5-cache/dev-cpp/gtest-9999
+++ b/metadata/md5-cache/dev-cpp/gtest-9999
@@ -8,6 +8,7 @@ IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=!dev-cpp/gmock
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=833e8e0d44482e4c85e1642a793ce951
+_md5_=130f286269a2632d2d26f1e23df30021
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-2.24.5 b/metadata/md5-cache/dev-cpp/gtkmm-2.24.5
index 089367060bc6..80e0b5377efc 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-2.24.5
+++ b/metadata/md5-cache/dev-cpp/gtkmm-2.24.5
@@ -7,7 +7,8 @@ IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.34.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.15:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/atkmm-2.22.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/cairomm-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/pangomm-2.34.0:1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/gtkmm/2.24/gtkmm-2.24.5.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=151a441b4d7e436f762203efd6d26197
+_md5_=a5906c722bdf4c6431da1c521a118b7d
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.24.0 b/metadata/md5-cache/dev-cpp/gtkmm-3.24.0
index cb7711941a5e..718984f7b49c 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.24.0
+++ b/metadata/md5-cache/dev-cpp/gtkmm-3.24.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.54.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.35.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/atkmm-2.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/cairomm-1.12.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/pangomm-2.38.2:1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=|| ( aqua wayland X )
+RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gtkmm/3.24/gtkmm-3.24.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aff662364bddf3a0e7c0b604d54c0de0
+_md5_=276f6383d8a91bb23a9c9591a4cd01e5
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.24.1 b/metadata/md5-cache/dev-cpp/gtkmm-3.24.1
index 92f8d496a931..bcda2cd4c1dc 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.24.1
+++ b/metadata/md5-cache/dev-cpp/gtkmm-3.24.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.54.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.35.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/atkmm-2.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/cairomm-1.12.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/pangomm-2.38.2:1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=|| ( aqua wayland X )
+RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gtkmm/3.24/gtkmm-3.24.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7895fbe856f36a65b1c2bc1381edfd29
+_md5_=2eaf95d91726c61626cfe30dd91cff56
diff --git a/metadata/md5-cache/dev-cpp/ms-gsl-2.0.0 b/metadata/md5-cache/dev-cpp/ms-gsl-2.0.0
index a171994f37af..c2fa9586d702 100644
--- a/metadata/md5-cache/dev-cpp/ms-gsl-2.0.0
+++ b/metadata/md5-cache/dev-cpp/ms-gsl-2.0.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/Microsoft/GSL
 IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Microsoft/GSL/archive/v2.0.0.tar.gz -> ms-gsl-2.0.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f767a6728682a5c5ccac8795f51635c6
+_md5_=fc23a83ed4087f123472981571f2e3e1
diff --git a/metadata/md5-cache/dev-cpp/ms-gsl-9999 b/metadata/md5-cache/dev-cpp/ms-gsl-9999
index 23e6ee68d604..cb91d3a579e6 100644
--- a/metadata/md5-cache/dev-cpp/ms-gsl-9999
+++ b/metadata/md5-cache/dev-cpp/ms-gsl-9999
@@ -6,6 +6,7 @@ HOMEPAGE=https://github.com/Microsoft/GSL
 IUSE=test
 LICENSE=MIT
 PROPERTIES=live
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bd9129d6f9923a123d296dc612210f7f
+_md5_=83da9fe8b6648249de42d6fe215d1ca1
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.2.5 b/metadata/md5-cache/dev-cpp/muParser-2.2.5
index f45092680286..8f0e7519e163 100644
--- a/metadata/md5-cache/dev-cpp/muParser-2.2.5
+++ b/metadata/md5-cache/dev-cpp/muParser-2.2.5
@@ -5,7 +5,8 @@ HOMEPAGE=http://muparser.beltoforion.de/
 IUSE=doc test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beltoforion/muparser/archive/v2.2.5.tar.gz -> muParser-2.2.5.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_=5b0555e95d1b990e9a46361598da3219
+_md5_=d34066c645c661bd4c1bc433d7779775
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.2.6.1 b/metadata/md5-cache/dev-cpp/muParser-2.2.6.1
index 970bcff63eaa..3810a3d37d06 100644
--- a/metadata/md5-cache/dev-cpp/muParser-2.2.6.1
+++ b/metadata/md5-cache/dev-cpp/muParser-2.2.6.1
@@ -5,7 +5,8 @@ HOMEPAGE=http://muparser.beltoforion.de/
 IUSE=doc test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beltoforion/muparser/archive/v2.2.6.1.tar.gz -> muParser-2.2.6.1.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_=52bfed8943cd30c45a0ae1f035bd8b43
+_md5_=d34066c645c661bd4c1bc433d7779775
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1
index 48bff64cac94..a44b41ed2b63 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1
@@ -7,7 +7,8 @@ HOMEPAGE=https://github.com/nlohmann/json https://nlohmann.github.io/json/
 IUSE=doc test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.6.1.tar.gz -> nlohmann_json-3.6.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82b32c0c85d188c76e47c506bca17f1a
+_md5_=ed07ccbb06bc3578d1fdb07efcd7d209
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2
index b70c1d775d3e..02a84e64a4a2 100644
--- a/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2
+++ b/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.2
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/jbeder/yaml-cpp
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0/0.6
 SRC_URI=https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.2.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b11bdc4464d5d085e957ebca535dd7c
+_md5_=e44e125197d72860b2abe23c978c9b8d
diff --git a/metadata/md5-cache/dev-db/apgdiff-1.4 b/metadata/md5-cache/dev-db/apgdiff-1.4
index 108b672ab5a6..63a76e665447 100644
--- a/metadata/md5-cache/dev-db/apgdiff-1.4
+++ b/metadata/md5-cache/dev-db/apgdiff-1.4
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/apgdiff/apgdiff-1.4-src.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0672156d6f13fce15933b099b7c2d4e6
+_md5_=0f299a3e141180c6b38c47a584f5cdd9
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.2.1 b/metadata/md5-cache/dev-db/apgdiff-2.2.1
index 8fc98ee2e8ac..7b0faf3ef7ef 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.2.1
+++ b/metadata/md5-cache/dev-db/apgdiff-2.2.1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://apgdiff.com/download/apgdiff-2.2.1-src.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6621ad0633c9dbdc9fcba1de0fbe4f01
+_md5_=72c383657306d39431a39c7073af1661
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.2.2 b/metadata/md5-cache/dev-db/apgdiff-2.2.2
index 45e0b89da8e0..519a77827f61 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.2.2
+++ b/metadata/md5-cache/dev-db/apgdiff-2.2.2
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://apgdiff.com/download/apgdiff-2.2.2-src.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f3ae0355a16d9a2f5d637963cc3bbc1b
+_md5_=85caa393b21c1987b40f465f39c0e27c
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.3 b/metadata/md5-cache/dev-db/apgdiff-2.3
index 9a885862501f..391baab49ee2 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.3
+++ b/metadata/md5-cache/dev-db/apgdiff-2.3
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://apgdiff.com/download/apgdiff-2.3-src.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f3ae0355a16d9a2f5d637963cc3bbc1b
+_md5_=85caa393b21c1987b40f465f39c0e27c
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.4 b/metadata/md5-cache/dev-db/apgdiff-2.4
index 842e87687a50..f2d74ff6f35a 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.4
+++ b/metadata/md5-cache/dev-db/apgdiff-2.4
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://apgdiff.com/download/apgdiff-2.4-src.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f3ae0355a16d9a2f5d637963cc3bbc1b
+_md5_=85caa393b21c1987b40f465f39c0e27c
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1 b/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1
index e0ee9a5609ed..5f2bf60a0b34 100644
--- a/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1
+++ b/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre
 REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v18.10.3-stable.tar.gz -> clickhouse-18.10.3.tar.gz https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ca30dcbd7c8b462ab36a63f3a26d918
+_md5_=087f852338899e3fe52ae48aacc9030c
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1 b/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1
index 13c1d8fd9204..ce37f9a352ec 100644
--- a/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1
+++ b/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre
 REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v18.12.17-stable.tar.gz -> clickhouse-18.12.17.tar.gz https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8308970a89497578e63befdefaeec412
+_md5_=4a7c7e5347738be5949938e72e405d00
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1 b/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1
index b6d2947b3ed2..65ede2b2635e 100644
--- a/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1
+++ b/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre
 REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v18.6.0-stable.tar.gz -> clickhouse-18.6.0.tar.gz https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4dd577d8ac39a38817ebb3569ccfae5d
+_md5_=3ed8baaf89b3bbd228e942c1422033a0
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r2 b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r2
index bf667dd68f83..5b577a4e0205 100644
--- a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r2
+++ b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf
 REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.13.1.11-stable.zip -> clickhouse-19.13.1.11.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62a5248d128100a61a104580dc64bfe7
+_md5_=75b17c4b2c0deb53e7bf1adfc37ce10b
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r3 b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r3
index ad4c8e641f31..24dce81dec6b 100644
--- a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r3
+++ b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf
 REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.13.1.11-stable.zip -> clickhouse-19.13.1.11.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d0213c96428a5edb5a1dd56674bd189
+_md5_=b62b06eb822a6c2799b3189fc681d242
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.15.2.2 b/metadata/md5-cache/dev-db/clickhouse-19.15.2.2
index ea0384dfaa91..9a2891508970 100644
--- a/metadata/md5-cache/dev-db/clickhouse-19.15.2.2
+++ b/metadata/md5-cache/dev-db/clickhouse-19.15.2.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf dev-cpp/sparsehash
 REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.15.2.2-stable.zip -> clickhouse-19.15.2.2.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=753db8aa5333daca1019ab1a6b7226a7
+_md5_=273c89de2227acd522b2993078f4a00b
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.5.3.8-r1 b/metadata/md5-cache/dev-db/clickhouse-19.5.3.8-r1
index e92fe8a37a83..76e19957f5c6 100644
--- a/metadata/md5-cache/dev-db/clickhouse-19.5.3.8-r1
+++ b/metadata/md5-cache/dev-db/clickhouse-19.5.3.8-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc
 REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.5.3.8-stable.zip -> clickhouse-19.5.3.8.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d061222671e44e8b128c8eef5edfad2f
+_md5_=f064f8efc27005d8fcbce7b51b99bb22
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.9.5.36-r1 b/metadata/md5-cache/dev-db/clickhouse-19.9.5.36-r1
index 5e80e7def5c0..462eed0adafd 100644
--- a/metadata/md5-cache/dev-db/clickhouse-19.9.5.36-r1
+++ b/metadata/md5-cache/dev-db/clickhouse-19.9.5.36-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc
 REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.9.5.36-stable.zip -> clickhouse-19.9.5.36.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d061222671e44e8b128c8eef5edfad2f
+_md5_=f064f8efc27005d8fcbce7b51b99bb22
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
index a139d1ea84e6..aefa1936b549 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
@@ -7,7 +7,8 @@ IUSE=+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test abi_x86_32
 KEYWORDS=amd64 arm arm64 hppa ia64 ppc64 s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) mysqlcompat? ( !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)] !dev-db/mysql-connector-c ) !>=dev-db/mariadb-10.2.0[client-libs(+)]
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://downloads.mariadb.org/f/connector-c-3.0.6/mariadb-connector-c-3.0.6-src.tar.gz?serve -> mariadb-connector-c-3.0.6-src.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1ff20b389c03eadfe1a6a8b3443bb80
+_md5_=9624a4a464b46d8298fd8f898bd295a1
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.13 b/metadata/md5-cache/dev-db/mongodb-3.6.13
index 9b2151608035..80e6d5b222aa 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.13
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.13
@@ -9,7 +9,8 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.13 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.13.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=9f927f76b3495bca20fc306c7c353daa
+_md5_=6eaa06a0981839fb32d9b649e2896a8d
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.14 b/metadata/md5-cache/dev-db/mongodb-3.6.14
index d3430f533ed7..5d67c28b1bf4 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.14
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.14
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.14 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.14.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=af8d615a536592a1cd059385ad5b22d4
+_md5_=069220b03b21e71a7ba2721e1365ba6a
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.8 b/metadata/md5-cache/dev-db/mongodb-3.6.8
index 25430a593436..be5c18fd712f 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.8
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.8
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=AGPL-3 Apache-2.0
 PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.8 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.8.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2140e8e16785195fed3f894fd23fdc9f
+_md5_=92d393d2e0dc9b17487b44ff41db8b5b
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.10 b/metadata/md5-cache/dev-db/mongodb-4.0.10
index 2a5bde170bec..0025c6ea4075 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.0.10
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.10
@@ -9,7 +9,8 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.10 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.10.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=434bd2fbd79777ca5b28d712d3692f59
+_md5_=ace0fa4a8499e888f43dec213462885c
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.12 b/metadata/md5-cache/dev-db/mongodb-4.0.12
index 0e767649a3e1..6a0843acc695 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.0.12
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.12
@@ -9,7 +9,8 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.12 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.12.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=93e2dd1c381998c5e57af4474a94ea2a
+_md5_=981e41f6d86d84ebdb22a2980fbc6a71
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.13 b/metadata/md5-cache/dev-db/mongodb-4.0.13
index b15ce015aba0..9605a9382501 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.0.13
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.13
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.13 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.13.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b07c77e4efd1869f00258d35af871df5
+_md5_=8e1158939ecab47da199df4ba62c0e9c
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.0-r2 b/metadata/md5-cache/dev-db/mongodb-4.2.0-r2
index 9efdcd435d6a..f81c49744c05 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.2.0-r2
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.0-r2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-4.2.0 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+)] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.0.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=dbb769282c6c22444a2dde24c06e8643
+_md5_=44f43af065dc452dc665769adb25ab3b
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.1 b/metadata/md5-cache/dev-db/mongodb-4.2.1
index 1fec77d2adca..8fa8a7db356d 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.2.1
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-4.2.1 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+)] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.1.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8b7b9b2ca1d38167dda999d86a22c740
+_md5_=b8ecb2cb0bb3eece9985bd46a556372f
diff --git a/metadata/md5-cache/dev-db/mycli-1.19.0 b/metadata/md5-cache/dev-db/mycli-1.19.0
index db4e5709be81..1324a2e42568 100644
--- a/metadata/md5-cache/dev-db/mycli-1.19.0
+++ b/metadata/md5-cache/dev-db/mycli-1.19.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/cli_helpers-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-2.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pymysql-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/python-sqlparse-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ssh? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/mycli/archive/v1.19.0.tar.gz -> mycli-1.19.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8ca744d5ea067cd2c201b531336fc4d7
+_md5_=f80802cb1e11581da4f61fddf23a7dd4
diff --git a/metadata/md5-cache/dev-db/mycli-1.20.1 b/metadata/md5-cache/dev-db/mycli-1.20.1
index 1695aa7abf02..3edc71f6533c 100644
--- a/metadata/md5-cache/dev-db/mycli-1.20.1
+++ b/metadata/md5-cache/dev-db/mycli-1.20.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/cli_helpers-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prompt_toolkit-2.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pymysql-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/python-sqlparse-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ssh? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/mycli/archive/v1.20.1.tar.gz -> mycli-1.20.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=983b50ee1fa893eb9a10c5d4fb8049e2
+_md5_=c201cbdbd08d95b2446f3baddd4fd190
diff --git a/metadata/md5-cache/dev-db/mycli-9999 b/metadata/md5-cache/dev-db/mycli-9999
index 051dfbb8033a..a560e2256ca2 100644
--- a/metadata/md5-cache/dev-db/mycli-9999
+++ b/metadata/md5-cache/dev-db/mycli-9999
@@ -9,6 +9,7 @@ LICENSE=BSD MIT
 PROPERTIES=live
 RDEPEND=>=dev-python/cli_helpers-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prompt_toolkit-2.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pymysql-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/python-sqlparse-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ssh? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3dc434493702c797f086ce1c20c71936
+_md5_=ecfbf323a851f8c845d09a8cbeda9a54
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.2-r1 b/metadata/md5-cache/dev-db/pgxnclient-1.2-r1
index 0bd15d91850f..e3aeffa7718f 100644
--- a/metadata/md5-cache/dev-db/pgxnclient-1.2-r1
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-db/postgresql-9.1[server] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d39164d57a450a19b05afb8477c99bf1
+_md5_=6cfa92b549d0485fc3acc45789a18c1c
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.2.1 b/metadata/md5-cache/dev-db/pgxnclient-1.2.1
index 6c0cf7e075e1..fdd64bc4cfe0 100644
--- a/metadata/md5-cache/dev-db/pgxnclient-1.2.1
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-db/postgresql-9.1[server] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ac377eee26b7d1fab39375f3e869e06
+_md5_=c7917adf0fe17907946e8c9d689621e5
diff --git a/metadata/md5-cache/dev-db/redis-4.0.10 b/metadata/md5-cache/dev-db/redis-4.0.10
index ab3539274829..cddd66300c15 100644
--- a/metadata/md5-cache/dev-db/redis-4.0.10
+++ b/metadata/md5-cache/dev-db/redis-4.0.10
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
 REQUIRED_USE=?? ( tcmalloc jemalloc )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-4.0.10.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79fc147bec7fc206bab28ee6b80670b0
+_md5_=7fd8ba368c7607ec07b2d4ae6f114a9b
diff --git a/metadata/md5-cache/dev-db/redis-4.0.11 b/metadata/md5-cache/dev-db/redis-4.0.11
index b2c50cca71ad..7f0573355372 100644
--- a/metadata/md5-cache/dev-db/redis-4.0.11
+++ b/metadata/md5-cache/dev-db/redis-4.0.11
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
 REQUIRED_USE=?? ( tcmalloc jemalloc )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-4.0.11.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5458e1a24dacbea1f44938e75af4a23e
+_md5_=eeea8e8637640f58fbf7af4ce9f5f957
diff --git a/metadata/md5-cache/dev-db/redis-4.0.12 b/metadata/md5-cache/dev-db/redis-4.0.12
index 0d2bb17ead67..31ea73853746 100644
--- a/metadata/md5-cache/dev-db/redis-4.0.12
+++ b/metadata/md5-cache/dev-db/redis-4.0.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
 REQUIRED_USE=?? ( tcmalloc jemalloc )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-4.0.12.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52fa7df289b5f4f1a1735ef354222440
+_md5_=eeea8e8637640f58fbf7af4ce9f5f957
diff --git a/metadata/md5-cache/dev-db/redis-4.0.13 b/metadata/md5-cache/dev-db/redis-4.0.13
index 8f2c3cb0bf7c..7eff376d0659 100644
--- a/metadata/md5-cache/dev-db/redis-4.0.13
+++ b/metadata/md5-cache/dev-db/redis-4.0.13
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
 REQUIRED_USE=?? ( tcmalloc jemalloc )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-4.0.13.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=be90cd6b29877e991d5ed00e35157ee2
+_md5_=eeea8e8637640f58fbf7af4ce9f5f957
diff --git a/metadata/md5-cache/dev-db/redis-4.0.14 b/metadata/md5-cache/dev-db/redis-4.0.14
index 5f4f3d0bec84..7bf97e655ba9 100644
--- a/metadata/md5-cache/dev-db/redis-4.0.14
+++ b/metadata/md5-cache/dev-db/redis-4.0.14
@@ -9,7 +9,8 @@ KEYWORDS=amd64 arm arm64 hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
 REQUIRED_USE=?? ( tcmalloc jemalloc )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-4.0.14.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c46afccb8c6043dee5a9dbc525eec6c5
+_md5_=f9c0f25b17946c6f853bcc6f5d02e2b5
diff --git a/metadata/md5-cache/dev-db/redis-4.0.2-r1 b/metadata/md5-cache/dev-db/redis-4.0.2-r1
index b066d118e01d..5f6ec852ec06 100644
--- a/metadata/md5-cache/dev-db/redis-4.0.2-r1
+++ b/metadata/md5-cache/dev-db/redis-4.0.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
 REQUIRED_USE=?? ( tcmalloc jemalloc )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-4.0.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1acf24eeb73e1c6a3d02f67b517a747d
+_md5_=4fadac81837bd9825a090490d03eb61a
diff --git a/metadata/md5-cache/dev-db/redis-5.0.3 b/metadata/md5-cache/dev-db/redis-5.0.3
index aa7b380c7e3d..badb4683ece6 100644
--- a/metadata/md5-cache/dev-db/redis-5.0.3
+++ b/metadata/md5-cache/dev-db/redis-5.0.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= )
 REQUIRED_USE=?? ( tcmalloc jemalloc )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-5.0.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a5c919e297a931be54de7d9df0366bf
+_md5_=b684bffe6b2a46a8575efe9f88e93859
diff --git a/metadata/md5-cache/dev-db/redis-5.0.4 b/metadata/md5-cache/dev-db/redis-5.0.4
index 4eef6fd567cc..d7273a9c01fc 100644
--- a/metadata/md5-cache/dev-db/redis-5.0.4
+++ b/metadata/md5-cache/dev-db/redis-5.0.4
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= )
 REQUIRED_USE=?? ( tcmalloc jemalloc )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-5.0.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=953e8a22a24a0e0e839f34c13b25475b
+_md5_=e85a0281641e04cbe0b6bedb851238ab
diff --git a/metadata/md5-cache/dev-db/redis-5.0.5 b/metadata/md5-cache/dev-db/redis-5.0.5
index e63e5ab6c94b..f3452cf7168e 100644
--- a/metadata/md5-cache/dev-db/redis-5.0.5
+++ b/metadata/md5-cache/dev-db/redis-5.0.5
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= )
 REQUIRED_USE=?? ( tcmalloc jemalloc )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-5.0.5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=953e8a22a24a0e0e839f34c13b25475b
+_md5_=e85a0281641e04cbe0b6bedb851238ab
diff --git a/metadata/md5-cache/dev-db/sadisplay-0.4.8 b/metadata/md5-cache/dev-db/sadisplay-0.4.8
index 8a4c1a154511..6fc8b28d04c0 100644
--- a/metadata/md5-cache/dev-db/sadisplay-0.4.8
+++ b/metadata/md5-cache/dev-db/sadisplay-0.4.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/estin/sadisplay/get/d67d12894ebd.tar.gz -> sadisplay-0.4.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c1658bcb854471139f6b20209c5fd647
+_md5_=f47803efe6f90a5d2f693a8283dd0eb9
diff --git a/metadata/md5-cache/dev-db/spatialite-4.3.0-r1 b/metadata/md5-cache/dev-db/spatialite-4.3.0-r1
index 0e57f3484b72..be2a5b9306f3 100644
--- a/metadata/md5-cache/dev-db/spatialite-4.3.0-r1
+++ b/metadata/md5-cache/dev-db/spatialite-4.3.0-r1
@@ -8,6 +8,7 @@ KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=MPL-1.1
 RDEPEND=>=dev-db/sqlite-3.7.5:3[extensions(+)] sys-libs/zlib geos? ( >=sci-libs/geos-3.4 ) proj? ( sci-libs/proj ) xls? ( dev-libs/freexl ) xml? ( dev-libs/libxml2 )
 REQUIRED_USE=test? ( iconv )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.3.0.tar.gz
-_md5_=e55466c14693241ccb243577510a9acc
+_md5_=ee039cea214db457136bf1b756e6b857
diff --git a/metadata/md5-cache/dev-db/spatialite-4.3.0a b/metadata/md5-cache/dev-db/spatialite-4.3.0a
index 677ca566cbb1..c65953c84a45 100644
--- a/metadata/md5-cache/dev-db/spatialite-4.3.0a
+++ b/metadata/md5-cache/dev-db/spatialite-4.3.0a
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=MPL-1.1
 RDEPEND=>=dev-db/sqlite-3.7.5:3[extensions(+)] sys-libs/zlib geos? ( >=sci-libs/geos-3.4 ) proj? ( sci-libs/proj:= ) xls? ( dev-libs/freexl ) xml? ( dev-libs/libxml2 )
 REQUIRED_USE=test? ( iconv )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.3.0a.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0985bd7591068133ad36929796509894
+_md5_=25ede49d517659cecc5492d9d38896b6
diff --git a/metadata/md5-cache/dev-db/sqlcipher-3.4.2 b/metadata/md5-cache/dev-db/sqlcipher-3.4.2
index 1c682744f8a3..38af1aa426b4 100644
--- a/metadata/md5-cache/dev-db/sqlcipher-3.4.2
+++ b/metadata/md5-cache/dev-db/sqlcipher-3.4.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=libedit? ( dev-libs/libedit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=libedit? ( !readline ) test? ( tcl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sqlcipher/sqlcipher/archive/v3.4.2.tar.gz -> sqlcipher-3.4.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a25ac30968605fb3781fbfebab0ce50
+_md5_=e7ffe80653f0af94417e54092a81f671
diff --git a/metadata/md5-cache/dev-db/sqlitebrowser-3.11.1-r1 b/metadata/md5-cache/dev-db/sqlitebrowser-3.11.1-r1
index e134b31b8ce3..cfd53c197e21 100644
--- a/metadata/md5-cache/dev-db/sqlitebrowser-3.11.1-r1
+++ b/metadata/md5-cache/dev-db/sqlitebrowser-3.11.1-r1
@@ -8,7 +8,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 MPL-2.0
 RDEPEND=app-editors/qhexedit2 dev-cpp/antlr-cpp:2 dev-db/sqlite:3 >=dev-libs/qcustomplot-2.0.0[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.10.1:=[qt5(+)] dev-qt/qtprintsupport:5 dev-qt/qtxml:5 dev-qt/qtsvg:5
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.11.1.tar.gz -> sqlitebrowser-3.11.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68b03ce2421f725e730e26e668f1e6af
+_md5_=8adfbfa5f291f6a5c048088469e37d75
diff --git a/metadata/md5-cache/dev-db/sqlitestudio-3.2.1-r1 b/metadata/md5-cache/dev-db/sqlitestudio-3.2.1-r1
index 7a58ef3bb7ab..c24e8dd33469 100644
--- a/metadata/md5-cache/dev-db/sqlitestudio-3.2.1-r1
+++ b/metadata/md5-cache/dev-db/sqlitestudio-3.2.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 cli? ( sys-libs/readline:0= ) cups? ( dev-qt/qtprintsupport:5 ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=test? ( cli )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sqlitestudio.pl/files/sqlitestudio3/complete/tar/sqlitestudio-3.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5a9285fbb81802602f1019d0095cce9
+_md5_=a19ce65f1252479723a61913be271d9c
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.2-r1 b/metadata/md5-cache/dev-embedded/libftdi-1.2-r1
index cdd190950a8d..48fd84f3e37f 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.2-r1
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2
 RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.2.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a376cea71360471cbaec23c05c60496
+_md5_=10e34dd66797150644b243b6f3c80c7b
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.2-r2 b/metadata/md5-cache/dev-embedded/libftdi-1.2-r2
index 109fc776747d..2059c772c597 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.2-r2
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.2-r2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.2.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5caeb77851bb9eb1f7a32d8556cc4c23
+_md5_=2cb9f7dc6368cfec16b5ca38f6400800
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.4 b/metadata/md5-cache/dev-embedded/libftdi-1.4
index ecf67471f27a..cafb7e3d475e 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.4
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.4.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5caeb77851bb9eb1f7a32d8556cc4c23
+_md5_=2cb9f7dc6368cfec16b5ca38f6400800
diff --git a/metadata/md5-cache/dev-embedded/libftdi-9999 b/metadata/md5-cache/dev-embedded/libftdi-9999
index b84142774fbf..567f295f5631 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-9999
+++ b/metadata/md5-cache/dev-embedded/libftdi-9999
@@ -8,6 +8,7 @@ LICENSE=LGPL-2
 PROPERTIES=live
 RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=1
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5caeb77851bb9eb1f7a32d8556cc4c23
+_md5_=2cb9f7dc6368cfec16b5ca38f6400800
diff --git a/metadata/md5-cache/dev-embedded/srecord-1.64 b/metadata/md5-cache/dev-embedded/srecord-1.64
index 606cc5a47cb3..e6e410a45c35 100644
--- a/metadata/md5-cache/dev-embedded/srecord-1.64
+++ b/metadata/md5-cache/dev-embedded/srecord-1.64
@@ -7,7 +7,8 @@ IUSE=static-libs test
 KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/srecord/srecord-1.64.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_=feef0cde5d4340381cf05fe02b379473
+_md5_=7fd8143a8ec7b7aaeed8ec26539b1637
diff --git a/metadata/md5-cache/dev-erlang/fast_xml-1.1.22 b/metadata/md5-cache/dev-erlang/fast_xml-1.1.22
index 8cf6ed1c4099..6e35b81aecb8 100644
--- a/metadata/md5-cache/dev-erlang/fast_xml-1.1.22
+++ b/metadata/md5-cache/dev-erlang/fast_xml-1.1.22
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 dev-libs/expat dev-lang/erlang
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/processone/fast_xml/archive/1.1.22.tar.gz -> fast_xml-1.1.22.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=807ca2fa4c8d0c3e05272b625854383c
+_md5_=806f3e6651ccd1a38633d0f586e464a6
diff --git a/metadata/md5-cache/dev-erlang/fast_xml-1.1.34 b/metadata/md5-cache/dev-erlang/fast_xml-1.1.34
index d961d0abbf2c..7a7f1740adc9 100644
--- a/metadata/md5-cache/dev-erlang/fast_xml-1.1.34
+++ b/metadata/md5-cache/dev-erlang/fast_xml-1.1.34
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-libs/expat dev-lang/erlang
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/processone/fast_xml/archive/1.1.34.tar.gz -> fast_xml-1.1.34.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=a378081f933d1a69a241e6ebde3ede11
+_md5_=98c1c8c0bd7cf8efe83133d9e9500689
diff --git a/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709 b/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
index 2a9cbbf733aa..7c099799edac 100644
--- a/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
+++ b/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=a8a65be6737461d5d3b259b68a8d38dd
+_md5_=64d57bb99e88a32ee284f2e8fc9be2fb
diff --git a/metadata/md5-cache/dev-erlang/meck-0.8.4 b/metadata/md5-cache/dev-erlang/meck-0.8.4
index e52a9b71ae81..2a8da55c575a 100644
--- a/metadata/md5-cache/dev-erlang/meck-0.8.4
+++ b/metadata/md5-cache/dev-erlang/meck-0.8.4
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eproxus/meck/archive/0.8.4.tar.gz -> meck-0.8.4.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=fb8ba0181712b9b0b944897911e623bf
+_md5_=7bbff469d26eba5fafe44383fa9bfee1
diff --git a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.1 b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.1
index b562c0e9ef23..56f3fca1e3bf 100644
--- a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.1
+++ b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/processone/p1_oauth2/archive/0.6.1.tar.gz -> p1_oauth2-0.6.1.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=8e631523d6ccf084b1483426b4ba9412
+_md5_=803a5ab40a890f69c15364eabeb092ec
diff --git a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.5 b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.5
index 50acf24e8705..ba4ef4f506a9 100644
--- a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.5
+++ b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/processone/p1_oauth2/archive/0.6.5.tar.gz -> p1_oauth2-0.6.5.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=cce3d0976973d605d2cc0e023c1a1ede
+_md5_=be1db729652ebaa8ef9c099e7a1b5ba5
diff --git a/metadata/md5-cache/dev-erlang/protobuffs-0.9.0 b/metadata/md5-cache/dev-erlang/protobuffs-0.9.0
index d37ff25e8a9b..ad5d3be1eeb3 100644
--- a/metadata/md5-cache/dev-erlang/protobuffs-0.9.0
+++ b/metadata/md5-cache/dev-erlang/protobuffs-0.9.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/basho/erlang_protobuffs/archive/0.9.0.tar.gz -> protobuffs-0.9.0.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=1fecf35b8267db72c0f3a8e4bc6b03de
+_md5_=917ef027d4227549dca80c28509d053a
diff --git a/metadata/md5-cache/dev-erlang/xmpp-1.1.9 b/metadata/md5-cache/dev-erlang/xmpp-1.1.9
index 8f903446b1a2..9f2751ba6de1 100644
--- a/metadata/md5-cache/dev-erlang/xmpp-1.1.9
+++ b/metadata/md5-cache/dev-erlang/xmpp-1.1.9
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/fast_xml-1.1.22 >=dev-erlang/stringprep-1.0.8 >=dev-lang/erlang-17.1 dev-lang/erlang
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/processone/xmpp/archive/1.1.9.tar.gz -> xmpp-1.1.9.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=37cfef8d6514aaf5d765d0373c60413a
+_md5_=5f63b54618f6ac7a7e8210773554ca8e
diff --git a/metadata/md5-cache/dev-erlang/xmpp-1.2.5 b/metadata/md5-cache/dev-erlang/xmpp-1.2.5
index 6a98acfa8b8e..6d62f315e6d0 100644
--- a/metadata/md5-cache/dev-erlang/xmpp-1.2.5
+++ b/metadata/md5-cache/dev-erlang/xmpp-1.2.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/ezlib-1.0.4 >=dev-erlang/fast_tls-1.0.14 >=dev-erlang/fast_xml-1.1.34 >=dev-erlang/p1_utils-1.0.13 >=dev-erlang/stringprep-1.0.14 dev-lang/erlang dev-lang/erlang
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/processone/xmpp/archive/1.2.5.tar.gz -> xmpp-1.2.5.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=1a149423a2543fe98fbab6c809dd68f7
+_md5_=eb59c9bcfe564ac9cccc4050d469ccba
diff --git a/metadata/md5-cache/dev-games/aseprite-1.1.6 b/metadata/md5-cache/dev-games/aseprite-1.1.6
index b6bdf8a69989..e063328431d2 100644
--- a/metadata/md5-cache/dev-games/aseprite-1.1.6
+++ b/metadata/md5-cache/dev-games/aseprite-1.1.6
@@ -7,7 +7,8 @@ IUSE=debug kde gtk3 test webp
 KEYWORDS=amd64 x86
 LICENSE=BSD GPL-2 MIT
 RDEPEND=dev-libs/tinyxml media-libs/allegro:0[X,png] media-libs/freetype media-libs/giflib:= webp? ( media-libs/libwebp ) media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/pixman gtk3? ( dev-cpp/gtkmm:3.0 ) kde? ( dev-qt/qtcore:5 kde-frameworks/kio:5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aseprite/aseprite/releases/download/v1.1.6/Aseprite-v1.1.6-Source.zip
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e7e329db3649f0fc2e584d5b63dfb1b
+_md5_=81ef7324724ae197127ffce32567f9c7
diff --git a/metadata/md5-cache/dev-games/aseprite-1.1.7 b/metadata/md5-cache/dev-games/aseprite-1.1.7
index 5f8992a7c13e..a4aa112a9077 100644
--- a/metadata/md5-cache/dev-games/aseprite-1.1.7
+++ b/metadata/md5-cache/dev-games/aseprite-1.1.7
@@ -7,7 +7,8 @@ IUSE=bundled-libs debug kde gtk3 test webp
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2 MIT
 RDEPEND=dev-libs/tinyxml !bundled-libs? ( media-libs/allegro:0[X,png] ) media-libs/freetype media-libs/giflib:= webp? ( media-libs/libwebp ) media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/pixman gtk3? ( dev-cpp/gtkmm:3.0 ) kde? ( dev-qt/qtcore:5 kde-frameworks/kio:5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aseprite/aseprite/releases/download/v1.1.7/Aseprite-v1.1.7-Source.zip
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=094db423657874c4360b654d234c3f43
+_md5_=1d134bed3266ab3f12b98a686f720eeb
diff --git a/metadata/md5-cache/dev-games/mygui-3.2.2 b/metadata/md5-cache/dev-games/mygui-3.2.2
index 355349b37fff..4d411aba156c 100644
--- a/metadata/md5-cache/dev-games/mygui-3.2.2
+++ b/metadata/md5-cache/dev-games/mygui-3.2.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=media-libs/freetype:2 ogre? ( dev-games/ogre:=[freeimage,opengl] samples? ( dev-games/ois ) ) opengl? ( virtual/opengl media-libs/glew ) tools? ( dev-games/ois )
 REQUIRED_USE=ogre? ( !opengl ) opengl? ( !ogre )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MyGUI/mygui/archive/MyGUI3.2.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8a564247c03a4cdec49b19b0b877538
+_md5_=4dcf7fce9bfeb738f0674564bc482cb0
diff --git a/metadata/md5-cache/dev-games/simgear-2018.3.1 b/metadata/md5-cache/dev-games/simgear-2018.3.1
index 0332bb803b56..95df7bbe72c1 100644
--- a/metadata/md5-cache/dev-games/simgear-2018.3.1
+++ b/metadata/md5-cache/dev-games/simgear-2018.3.1
@@ -7,7 +7,8 @@ IUSE=+dns debug gdal openmp subversion test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat <dev-games/openscenegraph-3.5.6:= media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/simgear-2018.3.1.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=933977bc2ec96c342b0488a80dfdb897
+_md5_=2bf72ff36ee33b306ec2ebb0cf488f6d
diff --git a/metadata/md5-cache/dev-games/simgear-2018.3.2 b/metadata/md5-cache/dev-games/simgear-2018.3.2
index 6286c28fed19..3ad4fc94adec 100644
--- a/metadata/md5-cache/dev-games/simgear-2018.3.2
+++ b/metadata/md5-cache/dev-games/simgear-2018.3.2
@@ -7,7 +7,8 @@ IUSE=cpu_flags_x86_sse2 +dns debug gdal openmp subversion test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat <dev-games/openscenegraph-3.5.6:= media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/simgear-2018.3.2.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f21e120009d681f138ae7b587faedbee
+_md5_=08c78df0ea186e25e9ec2f18d62f1284
diff --git a/metadata/md5-cache/dev-games/simgear-9999 b/metadata/md5-cache/dev-games/simgear-9999
index 1f5b2f791e6d..9688fa97550a 100644
--- a/metadata/md5-cache/dev-games/simgear-9999
+++ b/metadata/md5-cache/dev-games/simgear-9999
@@ -7,6 +7,7 @@ IUSE=cpu_flags_x86_sse2 +dns debug gdal openmp subversion test
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/expat <dev-games/openscenegraph-3.5.6:= media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27a76e0db17e960a64e7fe3effd65e22
+_md5_=4a6f8321d557e3d2a6f439915223f0e4
diff --git a/metadata/md5-cache/dev-go/fuzzy-0.0.3 b/metadata/md5-cache/dev-go/fuzzy-0.0.3
index 19df95f04e6d..29f123db0e90 100644
--- a/metadata/md5-cache/dev-go/fuzzy-0.0.3
+++ b/metadata/md5-cache/dev-go/fuzzy-0.0.3
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/sahilm/fuzzy
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
-RESTRICT=strip
+RESTRICT=strip !test? ( test )
 SLOT=0/0.0.3
 SRC_URI=https://github.com/sahilm/fuzzy/archive/v0.0.3.tar.gz -> fuzzy-0.0.3.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=d2ca8212b4750188b7065f107200c90f
+_md5_=3d8457af99c9576fe183dad82062a73d
diff --git a/metadata/md5-cache/dev-go/fuzzy-0.0.5 b/metadata/md5-cache/dev-go/fuzzy-0.0.5
index 0200324e1489..0c53c72afbc2 100644
--- a/metadata/md5-cache/dev-go/fuzzy-0.0.5
+++ b/metadata/md5-cache/dev-go/fuzzy-0.0.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/sahilm/fuzzy
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
-RESTRICT=strip
+RESTRICT=strip !test? ( test )
 SLOT=0/0.0.5
 SRC_URI=https://github.com/sahilm/fuzzy/archive/v0.0.5.tar.gz -> fuzzy-0.0.5.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=02a377548cb871341cb84e65ee3698a6
+_md5_=44f9c71d514719f3550fb03cc2eef62b
diff --git a/metadata/md5-cache/dev-haskell/asn1-encoding-0.8.1.3 b/metadata/md5-cache/dev-haskell/asn1-encoding-0.8.1.3
index 4d3939db8b63..0716d42c5b68 100644
--- a/metadata/md5-cache/dev-haskell/asn1-encoding-0.8.1.3
+++ b/metadata/md5-cache/dev-haskell/asn1-encoding-0.8.1.3
@@ -7,7 +7,8 @@ IUSE=test doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-types-0.2.1:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.12.1:=
+RESTRICT=!test? ( test )
 SLOT=0/0.8.1.3
 SRC_URI=https://hackage.haskell.org/package/asn1-encoding-0.8.1.3/asn1-encoding-0.8.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=830754cabfa031bef2bae4eb8afc850d
+_md5_=c85422e5a0e4b6a79e1523f3a2882dc9
diff --git a/metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.3 b/metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.3
index 14775b01afb9..6945c0d83857 100644
--- a/metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.3
+++ b/metadata/md5-cache/dev-haskell/base64-bytestring-0.1.1.3
@@ -7,7 +7,8 @@ IUSE=test doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/base64-bytestring-0.1.1.3/base64-bytestring-0.1.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7bb8778aa274af272e9063f2a9520d68
+_md5_=dcdb87811d52e8bdc4fe28c1fc8ec16d
diff --git a/metadata/md5-cache/dev-haskell/bio-0.5.3-r2 b/metadata/md5-cache/dev-haskell/bio-0.5.3-r2
index 852fcbdcf5a0..3010558a97e9 100644
--- a/metadata/md5-cache/dev-haskell/bio-0.5.3-r2
+++ b/metadata/md5-cache/dev-haskell/bio-0.5.3-r2
@@ -7,7 +7,8 @@ IUSE=+examples test doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/binary-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parallel:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/tagsoup-0.8:=[profile?] >=dev-lang/ghc-6.10.4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.5.3
 SRC_URI=https://hackage.haskell.org/package/bio-0.5.3/bio-0.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f01d85b194ff4cb943a5244cfe95ea1b
+_md5_=59d9100dacbb7de6732e2f70f045217d
diff --git a/metadata/md5-cache/dev-haskell/bytes-0.15.2 b/metadata/md5-cache/dev-haskell/bytes-0.15.2
index 0d469a61fff7..7efe1eab7b32 100644
--- a/metadata/md5-cache/dev-haskell/bytes-0.15.2
+++ b/metadata/md5-cache/dev-haskell/bytes-0.15.2
@@ -7,7 +7,8 @@ IUSE=+test-doctests doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.5.1:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cereal-0.3.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.0:=[profile?] <dev-haskell/scientific-1:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
 SLOT=0/0.15.2
 SRC_URI=https://hackage.haskell.org/package/bytes-0.15.2/bytes-0.15.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e145bab04eca452e6abcb615681fdad5
+_md5_=d7f5a068806829c7d305836fceef8110
diff --git a/metadata/md5-cache/dev-haskell/cereal-0.4.1.1 b/metadata/md5-cache/dev-haskell/cereal-0.4.1.1
index b945f422f07a..91bd9613c9f3 100644
--- a/metadata/md5-cache/dev-haskell/cereal-0.4.1.1
+++ b/metadata/md5-cache/dev-haskell/cereal-0.4.1.1
@@ -7,7 +7,8 @@ IUSE=test doc hscolour profile
 KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
 SLOT=0/0.4.1.1
 SRC_URI=https://hackage.haskell.org/package/cereal-0.4.1.1/cereal-0.4.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86683969cd3ba4d2655919e5811c06b0
+_md5_=dd5f7b078c3679b9217f0b46fc5ec3c2
diff --git a/metadata/md5-cache/dev-haskell/clientsession-0.9.1.1 b/metadata/md5-cache/dev-haskell/clientsession-0.9.1.1
index 0d2d625aa4dd..934474d7d168 100644
--- a/metadata/md5-cache/dev-haskell/clientsession-0.9.1.1
+++ b/metadata/md5-cache/dev-haskell/clientsession-0.9.1.1
@@ -7,7 +7,8 @@ IUSE=test doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/cipher-aes-0.1.7:=[profile?] >=dev-haskell/cprng-aes-0.2:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/crypto-random:=[profile?] >=dev-haskell/entropy-0.2.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/skein-1.0:=[profile?] <dev-haskell/skein-1.1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
 SLOT=0/0.9.1.1
 SRC_URI=https://hackage.haskell.org/package/clientsession-0.9.1.1/clientsession-0.9.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fbd57e5d87dc0c59330738320cd94f6e
+_md5_=c1b79316e21643419d1d6a1fba19aef3
diff --git a/metadata/md5-cache/dev-haskell/comonad-4.0 b/metadata/md5-cache/dev-haskell/comonad-4.0
index 0243b3958cd8..574f1d76e442 100644
--- a/metadata/md5-cache/dev-haskell/comonad-4.0
+++ b/metadata/md5-cache/dev-haskell/comonad-4.0
@@ -7,7 +7,8 @@ IUSE=+test-doctests doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.12.1:=
+RESTRICT=!test? ( test )
 SLOT=0/4.0
 SRC_URI=https://hackage.haskell.org/package/comonad-4.0/comonad-4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86ac6b89a0e9f7ed4ab5f3fbe633527f
+_md5_=21431104d806636d98525662aa276f9d
diff --git a/metadata/md5-cache/dev-haskell/comonad-4.2.7.2 b/metadata/md5-cache/dev-haskell/comonad-4.2.7.2
index 8a4b0cf82466..e73ea226c0d7 100644
--- a/metadata/md5-cache/dev-haskell/comonad-4.2.7.2
+++ b/metadata/md5-cache/dev-haskell/comonad-4.2.7.2
@@ -7,7 +7,8 @@ IUSE=+containers +contravariant +distributive +test-doctests doc hscolour profil
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.4.1:= contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+RESTRICT=!test? ( test )
 SLOT=0/4.2.7.2
 SRC_URI=https://hackage.haskell.org/package/comonad-4.2.7.2/comonad-4.2.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9306c0379833aac2148bcb0c9304f95
+_md5_=9bbd2194a7472c6e17507932469f0cc3
diff --git a/metadata/md5-cache/dev-haskell/comonad-5 b/metadata/md5-cache/dev-haskell/comonad-5
index 1a7655578529..7bbf2b57c04c 100644
--- a/metadata/md5-cache/dev-haskell/comonad-5
+++ b/metadata/md5-cache/dev-haskell/comonad-5
@@ -7,7 +7,8 @@ IUSE=+containers +contravariant +distributive +test-doctests doc hscolour profil
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.4.1:= contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://hackage.haskell.org/package/comonad-5/comonad-5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=00a424fdffd9ff25d1674568c75b1175
+_md5_=46c743e0f1ce70c8454efd477adc4836
diff --git a/metadata/md5-cache/dev-haskell/convertible-1.0.11.1 b/metadata/md5-cache/dev-haskell/convertible-1.0.11.1
index ef948ef62c15..1a9446069392 100644
--- a/metadata/md5-cache/dev-haskell/convertible-1.0.11.1
+++ b/metadata/md5-cache/dev-haskell/convertible-1.0.11.1
@@ -7,7 +7,8 @@ IUSE=test doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl[profile?] >=dev-haskell/text-0.7[profile?] >=dev-lang/ghc-6.8.2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/convertible-1.0.11.1/convertible-1.0.11.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=98906a35dc31e0bc2a3fef77643267f7
+_md5_=577f115df939ea11323008371302f9cd
diff --git a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7 b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
index 7b36153c64bb..20f1b9d9878b 100644
--- a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
+++ b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
@@ -7,7 +7,8 @@ IUSE=test doc hscolour profile
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
 SLOT=0/0.14.0.7
 SRC_URI=https://hackage.haskell.org/package/dataenc-0.14.0.7/dataenc-0.14.0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6770a6733ec34ef0551ea462dde45a42
+_md5_=84565f88c60c1227cded2741d1a65ff4
diff --git a/metadata/md5-cache/dev-haskell/hashed-storage-0.5.11 b/metadata/md5-cache/dev-haskell/hashed-storage-0.5.11
index bba4ae3c0cb1..94175f5c2df9 100644
--- a/metadata/md5-cache/dev-haskell/hashed-storage-0.5.11
+++ b/metadata/md5-cache/dev-haskell/hashed-storage-0.5.11
@@ -7,7 +7,8 @@ IUSE=diff hpc test doc hscolour profile
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/dataenc:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= diff? ( dev-haskell/lcs:=[profile?] )
+RESTRICT=!test? ( test )
 SLOT=0/0.5.11
 SRC_URI=https://hackage.haskell.org/package/hashed-storage-0.5.11/hashed-storage-0.5.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0bfd220bbbe65b8eb5f1460078caed33
+_md5_=af12b46767db1fe1dd5c04494d340c73
diff --git a/metadata/md5-cache/dev-haskell/hdbc-2.3.1.2 b/metadata/md5-cache/dev-haskell/hdbc-2.3.1.2
index 8ac5b3a72854..b5cda46ccaa9 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-2.3.1.2
+++ b/metadata/md5-cache/dev-haskell/hdbc-2.3.1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 PDEPEND=mysql? ( dev-haskell/hdbc-mysql ) odbc? ( =dev-haskell/hdbc-odbc-2.3* ) postgres? ( =dev-haskell/hdbc-postgresql-2.3* ) sqlite? ( >=dev-haskell/hdbc-sqlite3-2.3 )
 RDEPEND=>=dev-haskell/convertible-1.0.10.0:=[profile?] <dev-haskell/convertible-1.1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-6.12.1:=
+RESTRICT=!test? ( test )
 SLOT=2/2.3.1.2
 SRC_URI=https://hackage.haskell.org/package/HDBC-2.3.1.2/HDBC-2.3.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=69da2a95cb1f4c69e3f1b0898486a3ad
+_md5_=865a5cb90c07a9270118644b7c34ef81
diff --git a/metadata/md5-cache/dev-haskell/lens-3.10.0.1 b/metadata/md5-cache/dev-haskell/lens-3.10.0.1
index bdc4137b702c..9b319dae4566 100644
--- a/metadata/md5-cache/dev-haskell/lens-3.10.0.1
+++ b/metadata/md5-cache/dev-haskell/lens-3.10.0.1
@@ -7,7 +7,8 @@ IUSE=benchmark-uniplate dump-splices +inlining lib-werror old-inline-pragmas saf
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.0.1:=
+RESTRICT=!test? ( test )
 SLOT=0/3.10.0.1
 SRC_URI=https://hackage.haskell.org/package/lens-3.10.0.1/lens-3.10.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a80995c6ee26d232b630471b12c4670a
+_md5_=74014af330de49a9c598e9cb27af9285
diff --git a/metadata/md5-cache/dev-haskell/lens-3.9.2 b/metadata/md5-cache/dev-haskell/lens-3.9.2
index 4d9e48a27925..c59a231500dc 100644
--- a/metadata/md5-cache/dev-haskell/lens-3.9.2
+++ b/metadata/md5-cache/dev-haskell/lens-3.9.2
@@ -7,7 +7,8 @@ IUSE=benchmark-uniplate dump-splices +inlining lib-werror old-inline-pragmas saf
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/bifunctors-3:=[profile?] <dev-haskell/bifunctors-4:=[profile?] >=dev-haskell/comonad-3:=[profile?] <dev-haskell/comonad-4:=[profile?] >=dev-haskell/comonad-transformers-3:=[profile?] <dev-haskell/comonad-transformers-4:=[profile?] >=dev-haskell/comonads-fd-3:=[profile?] <dev-haskell/comonads-fd-4:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctor-extras-3.3:=[profile?] <dev-haskell/profunctor-extras-4:=[profile?] >=dev-haskell/profunctors-3.2:=[profile?] <dev-haskell/profunctors-4:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-3.0.2:=[profile?] <dev-haskell/semigroupoids-4:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.0.1:=
+RESTRICT=!test? ( test )
 SLOT=0/3.9.2
 SRC_URI=https://hackage.haskell.org/package/lens-3.9.2/lens-3.9.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=813cfecfa92764a1036f5d67918fa433
+_md5_=ef6595a8d46c64b1b72ff9b49e7103f2
diff --git a/metadata/md5-cache/dev-haskell/lens-4.11 b/metadata/md5-cache/dev-haskell/lens-4.11
index cf2828ccbc9f..3fd440dbd3d7 100644
--- a/metadata/md5-cache/dev-haskell/lens-4.11
+++ b/metadata/md5-cache/dev-haskell/lens-4.11
@@ -7,7 +7,8 @@ IUSE=benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-d
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/kan-extensions-4.2.1:=[profile?] <dev-haskell/kan-extensions-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
 SLOT=0/4.11
 SRC_URI=https://hackage.haskell.org/package/lens-4.11/lens-4.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a0ec31c95e52d73839919e6cc116e6ec
+_md5_=4ebbab2ed1a1c7e04bac1b0be09f5ed2
diff --git a/metadata/md5-cache/dev-haskell/lens-4.14 b/metadata/md5-cache/dev-haskell/lens-4.14
index 7c4e1f87e065..e02ab2961728 100644
--- a/metadata/md5-cache/dev-haskell/lens-4.14
+++ b/metadata/md5-cache/dev-haskell/lens-4.14
@@ -7,7 +7,8 @@ IUSE=benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-d
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
 SLOT=0/4.14
 SRC_URI=https://hackage.haskell.org/package/lens-4.14/lens-4.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fdd494522035eec57b3805210124031c
+_md5_=2893913d3ae61be6ebea4768378f0402
diff --git a/metadata/md5-cache/dev-haskell/lens-4.6.0.1 b/metadata/md5-cache/dev-haskell/lens-4.6.0.1
index 30d0e622e87b..94fc07f56df9 100644
--- a/metadata/md5-cache/dev-haskell/lens-4.6.0.1
+++ b/metadata/md5-cache/dev-haskell/lens-4.6.0.1
@@ -7,7 +7,8 @@ IUSE=benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-d
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] >=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/primitive-0.4.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?] >=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
 SLOT=0/4.6.0.1
 SRC_URI=https://hackage.haskell.org/package/lens-4.6.0.1/lens-4.6.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a1d4038d105c3d0ca7977603565b154
+_md5_=69daba0ec6eb9ed71df8333d381492fe
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.3.1 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.3.1
index faad21482dfa..4169ef6e400a 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.3.1
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.3.1
@@ -7,7 +7,8 @@ IUSE=+bibutils embed-data-files +hexpat +network test-citeproc unicode_collation
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.12.1:=[profile?] dev-haskell/aeson:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2:=[profile?] dev-haskell/network-uri:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
+RESTRICT=!test? ( test )
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/pandoc-citeproc-0.3.1/pandoc-citeproc-0.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8c5a0de79979b9febaf54b21ff29921c
+_md5_=c3f2bea0632f9d5c0523ad08cf2f1a1a
diff --git a/metadata/md5-cache/dev-haskell/puremd5-2.1.3 b/metadata/md5-cache/dev-haskell/puremd5-2.1.3
index 3d6c7102710b..de87e6a00196 100644
--- a/metadata/md5-cache/dev-haskell/puremd5-2.1.3
+++ b/metadata/md5-cache/dev-haskell/puremd5-2.1.3
@@ -7,7 +7,8 @@ IUSE=test doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4.0:=[profile?] >=dev-haskell/cereal-0.2:=[profile?] dev-haskell/crypto-api:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
 SLOT=0/2.1.3
 SRC_URI=https://hackage.haskell.org/package/pureMD5-2.1.3/pureMD5-2.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a6bc24dd28b6b314ec393aa1dc5cf64
+_md5_=ac8b311d89086d728ce7e8ea20a142b4
diff --git a/metadata/md5-cache/dev-haskell/scientific-0.3.3.8 b/metadata/md5-cache/dev-haskell/scientific-0.3.3.8
index a78a345e2584..b2d1d524795a 100644
--- a/metadata/md5-cache/dev-haskell/scientific-0.3.3.8
+++ b/metadata/md5-cache/dev-haskell/scientific-0.3.3.8
@@ -7,7 +7,8 @@ IUSE=+bytestring-builder doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.6.1:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.3.8
 SRC_URI=https://hackage.haskell.org/package/scientific-0.3.3.8/scientific-0.3.3.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc4a98b85de317cdc7d8b62fd8df3ecc
+_md5_=28ed3028bdf9baf7d3a4393ec40a919a
diff --git a/metadata/md5-cache/dev-haskell/scientific-0.3.4.4 b/metadata/md5-cache/dev-haskell/scientific-0.3.4.4
index 101b4e06c2e5..64491da64d9f 100644
--- a/metadata/md5-cache/dev-haskell/scientific-0.3.4.4
+++ b/metadata/md5-cache/dev-haskell/scientific-0.3.4.4
@@ -7,7 +7,8 @@ IUSE=+bytestring-builder doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.6.1:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.4.4
 SRC_URI=https://hackage.haskell.org/package/scientific-0.3.4.4/scientific-0.3.4.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3cd4c8570951d31b2a08688685193287
+_md5_=d36c6c748c1848a46f19ee4741b9511b
diff --git a/metadata/md5-cache/dev-haskell/scientific-0.3.4.6 b/metadata/md5-cache/dev-haskell/scientific-0.3.4.6
index 5f45f230bcad..2d9c7f5da4f8 100644
--- a/metadata/md5-cache/dev-haskell/scientific-0.3.4.6
+++ b/metadata/md5-cache/dev-haskell/scientific-0.3.4.6
@@ -7,7 +7,8 @@ IUSE=+bytestring-builder doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-7.6.1:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.4.6
 SRC_URI=https://hackage.haskell.org/package/scientific-0.3.4.6/scientific-0.3.4.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a708621b18b4a04dcd28c89c0dfd034f
+_md5_=26a0f60a824f8016f6876c144bba1292
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-1.2.1.1 b/metadata/md5-cache/dev-haskell/shakespeare-1.2.1.1
index 4911db281259..47e6246f8e89 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-1.2.1.1
+++ b/metadata/md5-cache/dev-haskell/shakespeare-1.2.1.1
@@ -7,7 +7,8 @@ IUSE=test-export doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.12.1:=
+RESTRICT=!test? ( test )
 SLOT=0/1.2.1.1
 SRC_URI=https://hackage.haskell.org/package/shakespeare-1.2.1.1/shakespeare-1.2.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d49e427715c6ef91e0a380af0f7c4a47
+_md5_=3dc6eb1fc0191b3ec592b093521e9d87
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-2.0.12.1 b/metadata/md5-cache/dev-haskell/shakespeare-2.0.12.1
index 453553cb58c0..6adc49a1df7f 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-2.0.12.1
+++ b/metadata/md5-cache/dev-haskell/shakespeare-2.0.12.1
@@ -7,7 +7,8 @@ IUSE=test-coffee test-export test-roy doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
 SLOT=0/2.0.12.1
 SRC_URI=https://hackage.haskell.org/package/shakespeare-2.0.12.1/shakespeare-2.0.12.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d57d07db9182f6391642d1a8bcfd43e
+_md5_=8f529b892bc607a3fd21d7baa01d8a58
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-2.0.7 b/metadata/md5-cache/dev-haskell/shakespeare-2.0.7
index 2e08a1bd3dd6..d83cfa05cc8d 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-2.0.7
+++ b/metadata/md5-cache/dev-haskell/shakespeare-2.0.7
@@ -7,7 +7,8 @@ IUSE=test-coffee test-export test-roy doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/scientific:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.6.1:=
+RESTRICT=!test? ( test )
 SLOT=0/2.0.7
 SRC_URI=https://hackage.haskell.org/package/shakespeare-2.0.7/shakespeare-2.0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79f37769a67302852f5b716c4ba2e631
+_md5_=d966bbbb6b7ea0149295a2acc5a05ecf
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-js-1.2.0.4 b/metadata/md5-cache/dev-haskell/shakespeare-js-1.2.0.4
index b7ded6610c1e..bdcc374e74d5 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-js-1.2.0.4
+++ b/metadata/md5-cache/dev-haskell/shakespeare-js-1.2.0.4
@@ -7,7 +7,8 @@ IUSE=test-coffee test-export test-roy doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] >=dev-haskell/shakespeare-1.2:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.2.0.4
 SRC_URI=https://hackage.haskell.org/package/shakespeare-js-1.2.0.4/shakespeare-js-1.2.0.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=84ad370fd68816d302238ce7133c8554
+_md5_=a83dbba6aa1f5b9a55bf129157dad0e3
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.6.4 b/metadata/md5-cache/dev-haskell/texmath-0.6.4
index f815f298381b..4d875a3bad8f 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.6.4
+++ b/metadata/md5-cache/dev-haskell/texmath-0.6.4
@@ -7,7 +7,8 @@ IUSE=cgi test doc hscolour profile
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-haskell/pandoc-types:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-6.10.4:= cgi? ( dev-haskell/cgi:=[profile?] dev-haskell/json:=[profile?] dev-haskell/utf8-string:=[profile?] )
+RESTRICT=!test? ( test )
 SLOT=0/0.6.4
 SRC_URI=https://hackage.haskell.org/package/texmath-0.6.4/texmath-0.6.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8690a0f2d58c0ff273348354db87d787
+_md5_=4fda05b7cd0946988fb350297b02668f
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.6.6.3 b/metadata/md5-cache/dev-haskell/texmath-0.6.6.3
index 24f61f574454..a7371ee5c22a 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.6.6.3
+++ b/metadata/md5-cache/dev-haskell/texmath-0.6.6.3
@@ -7,7 +7,8 @@ IUSE=cgi test doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-haskell/pandoc-types:=[profile?] >=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-7.4.1:= cgi? ( dev-haskell/cgi:=[profile?] dev-haskell/json:=[profile?] dev-haskell/utf8-string:=[profile?] )
+RESTRICT=!test? ( test )
 SLOT=0/0.6.6.3
 SRC_URI=https://hackage.haskell.org/package/texmath-0.6.6.3/texmath-0.6.6.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ae2d767d12fe2550992bdfdfa7da92f5
+_md5_=3505d920b9fd51ce6c5c406a1e005f65
diff --git a/metadata/md5-cache/dev-haskell/x509-store-1.4.4 b/metadata/md5-cache/dev-haskell/x509-store-1.4.4
index 57a13ea4b867..7983e0d97cb9 100644
--- a/metadata/md5-cache/dev-haskell/x509-store-1.4.4
+++ b/metadata/md5-cache/dev-haskell/x509-store-1.4.4
@@ -7,7 +7,8 @@ IUSE=executable test doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-encoding-0.8:=[profile?] <dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.2:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?] >=dev-haskell/crypto-pubkey-types-0.3:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.4.3:=[profile?] <dev-haskell/x509-1.5:=[profile?] >=dev-lang/ghc-6.12.1:=
+RESTRICT=!test? ( test )
 SLOT=0/1.4.4
 SRC_URI=https://hackage.haskell.org/package/x509-store-1.4.4/x509-store-1.4.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=35be02cc2e34b525c66ded09dbc09bf9
+_md5_=86cc0288f024f185c3ee65b94ed8bd1e
diff --git a/metadata/md5-cache/dev-haskell/x509-store-1.5.0 b/metadata/md5-cache/dev-haskell/x509-store-1.5.0
index 3e5290064624..545feae5c2c0 100644
--- a/metadata/md5-cache/dev-haskell/x509-store-1.5.0
+++ b/metadata/md5-cache/dev-haskell/x509-store-1.5.0
@@ -7,7 +7,8 @@ IUSE=executable test doc hscolour profile
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/crypto-pubkey-types-0.3:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
 SLOT=0/1.5.0
 SRC_URI=https://hackage.haskell.org/package/x509-store-1.5.0/x509-store-1.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3a859adf25cc0ee3d748c72e391335e
+_md5_=277c8076c19ea83e79d9363c9b26440c
diff --git a/metadata/md5-cache/dev-java/antlr-3.2 b/metadata/md5-cache/dev-java/antlr-3.2
index 88dc9e5a5288..c3c13b826e4a 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2
+++ b/metadata/md5-cache/dev-java/antlr-3.2
@@ -7,7 +7,8 @@ IUSE=doc test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://www.antlr3.org/download/antlr-3.2.tar.gz https://www.antlr3.org/download/antlr-3.2.jar
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f7efaccd9c2a15116ed82b75051609c2
+_md5_=53f34f4ef4f2db7eeb13ffd66135a9f3
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.2 b/metadata/md5-cache/dev-java/antlr-3.5.2
index f72905b77cc0..a62c27563947 100644
--- a/metadata/md5-cache/dev-java/antlr-3.5.2
+++ b/metadata/md5-cache/dev-java/antlr-3.5.2
@@ -7,7 +7,8 @@ IUSE=doc test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-java/stringtemplate:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
 SLOT=3.5
 SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz https://www.antlr3.org/download/antlr-3.5.2-complete.jar
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c4f9d1ee30fdd413c2c54afeee8b246c
+_md5_=0d18809426c994eeabf695593cc03ff7
diff --git a/metadata/md5-cache/dev-java/antlr-4.5.1 b/metadata/md5-cache/dev-java/antlr-4.5.1
index 90e84d20f1bd..187321354cbe 100644
--- a/metadata/md5-cache/dev-java/antlr-4.5.1
+++ b/metadata/md5-cache/dev-java/antlr-4.5.1
@@ -7,7 +7,8 @@ IUSE=doc test elibc_FreeBSD source elibc_FreeBSD
 KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.5.1.tar.gz -> antlr-4.5.1.tar.gz https://www.antlr.org/download/antlr-4.5.1-complete.jar
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ff670d3888e4264e9363893f6fe40633
+_md5_=0ce243730f311cc0b6d1d822be474e18
diff --git a/metadata/md5-cache/dev-java/antlr-4.5.3 b/metadata/md5-cache/dev-java/antlr-4.5.3
index abd012bdbc04..5efa29ec4e59 100644
--- a/metadata/md5-cache/dev-java/antlr-4.5.3
+++ b/metadata/md5-cache/dev-java/antlr-4.5.3
@@ -7,7 +7,8 @@ IUSE=doc test elibc_FreeBSD source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.5.3.tar.gz -> antlr-4.5.3.tar.gz https://www.antlr.org/download/antlr-4.5.3-complete.jar
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=dc5fa42f4c29b2e017dcfcdc4ba2d022
+_md5_=c1d6c0a4a64af398fc2e12b366914b64
diff --git a/metadata/md5-cache/dev-java/bcel-6.0_rc3 b/metadata/md5-cache/dev-java/bcel-6.0_rc3
index 95ea4c993270..1e677f3ce334 100644
--- a/metadata/md5-cache/dev-java/bcel-6.0_rc3
+++ b/metadata/md5-cache/dev-java/bcel-6.0_rc3
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apache/commons-bcel/archive/BCEL_6_0_RC3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e8c698b9bd7298bb173f2d55516abb48
+_md5_=63714e3aac8a76e091bf69634942332f
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.3.1 b/metadata/md5-cache/dev-java/commons-cli-1.3.1
index d6521cfafcad..b0c80ccf1698 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.3.1
+++ b/metadata/md5-cache/dev-java/commons-cli-1.3.1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.3.1-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8b8753301b49aa1970f40045203e16fa
+_md5_=9f4ccc4dee1eb8c8e173dd59dcd20546
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.4 b/metadata/md5-cache/dev-java/commons-cli-1.4
index 2e2ba1c301e1..184a9672765b 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.4
+++ b/metadata/md5-cache/dev-java/commons-cli-1.4
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.4-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=87a95638d9243f2e2cd6cc822ac2682a
+_md5_=b3c503cc8dacf2b294e62834ac938204
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.7 b/metadata/md5-cache/dev-java/commons-codec-1.7
index 9cb1d38f700e..8fa8228f3af3 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.7
+++ b/metadata/md5-cache/dev-java/commons-codec-1.7
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.7-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a2893132c0e416c741f86b2e40525814
+_md5_=e1f1102275d094ae9f8ebb4c58e3e06a
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1 b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
index 9e93e4d9a9a3..b6abef2ef5bc 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
@@ -7,7 +7,8 @@ IUSE=test-framework elibc_FreeBSD doc source test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 test-framework? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ef71d71350e4086011262beef62b0e20
+_md5_=13ffc6be530660f6bde21b06abdc6274
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r2 b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r2
index ddab2014f33c..605d9dbed1e8 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r2
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r2
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=706646d68ce7b9f81e839a0357935ef7
+_md5_=6f26797f8d8cb94ae20abd15cc5ee2b5
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.1 b/metadata/md5-cache/dev-java/commons-collections-4.1
index 31800b5045fe..8d77d86f0186 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.1
+++ b/metadata/md5-cache/dev-java/commons-collections-4.1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.1-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bd6ab5d01d5d6f7f82098f7d93c6e610
+_md5_=5c30a1d136b12c75502c695d96fab1b0
diff --git a/metadata/md5-cache/dev-java/commons-io-2.4 b/metadata/md5-cache/dev-java/commons-io-2.4
index 26e298b29458..2540ef735265 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.4
+++ b/metadata/md5-cache/dev-java/commons-io-2.4
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.4-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=feb908b65673b91e9d738dfab119e2c6
+_md5_=90982f2fe38e7c85761697a721f5bc97
diff --git a/metadata/md5-cache/dev-java/dynalang-0.4-r1 b/metadata/md5-cache/dev-java/dynalang-0.4-r1
index b23de1f66953..fc9b23287531 100644
--- a/metadata/md5-cache/dev-java/dynalang-0.4-r1
+++ b/metadata/md5-cache/dev-java/dynalang-0.4-r1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/dynalang/dynalang/dynalang-mop-0.4.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=99c5353eb5b9346bbd1ce0540b739b5a
+_md5_=929193fae75768c87a93ef4f2cda5faa
diff --git a/metadata/md5-cache/dev-java/fontbox-1.8.11 b/metadata/md5-cache/dev-java/fontbox-1.8.11
index 646a80a1c647..3b8cc3e107c7 100644
--- a/metadata/md5-cache/dev-java/fontbox-1.8.11
+++ b/metadata/md5-cache/dev-java/fontbox-1.8.11
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-java/commons-logging-1.1.1:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=1.8
 SRC_URI=mirror://apache/pdfbox/1.8.11/pdfbox-1.8.11-src.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c4801fb80e5766d9c5c40970e4a9a9b4
+_md5_=6e17c9bd9d0520a1a55fdad2e2dfc561
diff --git a/metadata/md5-cache/dev-java/freehep-graphics2d-2.4 b/metadata/md5-cache/dev-java/freehep-graphics2d-2.4
index 9c793833be76..e9e6b5863aaf 100644
--- a/metadata/md5-cache/dev-java/freehep-graphics2d-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphics2d-2.4
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 LGPL-2.1
 RDEPEND=~dev-java/freehep-graphicsbase-2.4:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz https://github.com/freehep/freehep-chartable-converter-plugin/archive/freehep-chartable-converter-plugin-2.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=49881a3443f77ca7c99337d6cd8d9c53
+_md5_=faef5e4d47c084f2b2c0ae30822995ce
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4
index 11dccd344ee2..f3272c2a8871 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphicsbase-2.4
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 LGPL-2.1
 RDEPEND=dev-java/freehep-io:0 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=db3665902764170bfbc693a6d53b742b
+_md5_=1cf26d6ffbea1cb6752b5ae75e522ec5
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsio-2.4
index 40b4799515fc..793e9729fcb6 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-2.4
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 LGPL-2.1
 RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 dev-java/freehep-io:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0dd0734058d76cf6f1bf92505124b8e9
+_md5_=3a38086222756915858c5033f88d4643
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.4
index 01fdf8d53c1b..35838716b167 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.4
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 LGPL-2.1
 RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 ~dev-java/freehep-graphicsio-2.4:0 dev-java/freehep-io:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e54660475680b4b6ec7ef8c3c16ea465
+_md5_=0e411570d26ba876ac7b9dabb7106cde
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.4
index 3e415a476d9a..fc5745907499 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.4
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 LGPL-2.1
 RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 ~dev-java/freehep-graphicsio-2.4:0 dev-java/freehep-io:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9a9b67b7f2fa32fe1f1f960d8d10f7f4
+_md5_=1f300db7ade3dd644545f88d193dbff6
diff --git a/metadata/md5-cache/dev-java/freehep-io-2.2.2 b/metadata/md5-cache/dev-java/freehep-io-2.2.2
index d139a8e7077a..cfd1f33453fa 100644
--- a/metadata/md5-cache/dev-java/freehep-io-2.2.2
+++ b/metadata/md5-cache/dev-java/freehep-io-2.2.2
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 LGPL-2.1
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/freehep/freehep-io/archive/freehep-io-2.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=aba2e19090a8092beb57957bef1e3a24
+_md5_=23af37d098ba8f89cc67ee2fed568c04
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.13 b/metadata/md5-cache/dev-java/htmlcleaner-2.13
index f124f52eb793..38af493ebbe0 100644
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.13
+++ b/metadata/md5-cache/dev-java/htmlcleaner-2.13
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-java/jdom:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/htmlcleaner/files/htmlcleaner-2.13-src.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c838b539b9d9f7822404768a74a60d32
+_md5_=8035349af4d8e1581bfd72e3a11cd5b1
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
index 379b32bb89ca..60f57167596c 100644
--- a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
+++ b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
@@ -7,7 +7,8 @@ IUSE=+doc test elibc_FreeBSD
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jdk-1.6.0 >=media-sound/pulseaudio-0.9.11:= >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fcb9663ed28dfd70abc63c2f0f8904c2
+_md5_=3d16676df51eaf1c169c2eb9573b926a
diff --git a/metadata/md5-cache/dev-java/jackson-2.9.10 b/metadata/md5-cache/dev-java/jackson-2.9.10
index ab24eb42da62..c4f6287dc3dd 100644
--- a/metadata/md5-cache/dev-java/jackson-2.9.10
+++ b/metadata/md5-cache/dev-java/jackson-2.9.10
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.9.10.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827
-_md5_=1421a0d53d408f693ef1dd19c9d45076
+_md5_=bfd954eae220ab3a6b1c38772cf99805
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.9.10 b/metadata/md5-cache/dev-java/jackson-annotations-2.9.10
index 25f619939fb4..3cd198d76e85 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.9.10
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.9.10
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.9.10.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827
-_md5_=70ea9ab26630ad59649647b78277fb38
+_md5_=f97393dcfc307b2394415bab178cf57a
diff --git a/metadata/md5-cache/dev-java/jamon-2.81 b/metadata/md5-cache/dev-java/jamon-2.81
index 9798a02cd342..8a9ae49c15ee 100644
--- a/metadata/md5-cache/dev-java/jamon-2.81
+++ b/metadata/md5-cache/dev-java/jamon-2.81
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-java/log4j:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 www-servers/tomcat:7 >=virtual/jre-1.7 dev-db/hsqldb:0 dev-java/jakarta-oro:2.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/stevensouza/jamonapi/archive/v2_81.tar.gz -> jamonapi-2_81.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0dc6fea4fe09b0fed823b3db68c08076
+_md5_=650d51c4fcc73a1ed6908419bb8e3637
diff --git a/metadata/md5-cache/dev-java/java-config-2.2.0-r4 b/metadata/md5-cache/dev-java/java-config-2.2.0-r4
index e74c61a12255..d614ee0e8f92 100644
--- a/metadata/md5-cache/dev-java/java-config-2.2.0-r4
+++ b/metadata/md5-cache/dev-java/java-config-2.2.0-r4
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=GPL-2
 RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://dev.gentoo.org/~gyakovlev/distfiles/java-config-2.2.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81cc0d3a2db106e7c09ca5b32959d6ae
+_md5_=5d3ad46facee3ee3d299a2aab48b2a0c
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
index cbfb6f8d18ba..b8ac0bb0ea5d 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86
 LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1003.src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ecafbb464bd36a03f196d08a6d407adb
+_md5_=1a2ad541658dbf076ed8f176d440fcfd
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
index f120dacb170e..aafac7aef7e6 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1004.src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=350390cc71e457245bd83f558453d66c
+_md5_=b3eedee8b6a0227b2744a4efb5592b5f
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
index 8aa5e6b8e553..13287642e1ff 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-9.3-1100.src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=350390cc71e457245bd83f558453d66c
+_md5_=b3eedee8b6a0227b2744a4efb5592b5f
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6-r4 b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
index e67bc4f0f8f2..6b6691e036d1 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6-r4
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-1.1
 RDEPEND=dev-java/xalan:0 dev-java/jaxen:1.1 dev-java/iso-relax:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=07e6a0339f0650a8ffceb89b2ff929d4
+_md5_=c0caecc204b460fb02114f50725c4536
diff --git a/metadata/md5-cache/dev-java/jettison-1.3.7 b/metadata/md5-cache/dev-java/jettison-1.3.7
index 778f6e598579..791240e22be8 100644
--- a/metadata/md5-cache/dev-java/jettison-1.3.7
+++ b/metadata/md5-cache/dev-java/jettison-1.3.7
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/codehaus/jettison/archive/jettison-1.3.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e26111e976bf5541e0dfd87dd3c370cf
+_md5_=46414f8b85824dd36f010f6a4484b358
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1 b/metadata/md5-cache/dev-java/jflex-1.6.1
index e17ffd3681e0..bf961c6b2cc1 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 PDEPEND=>=dev-java/javacup-0.11b_p20151001:0
 RDEPEND=>=virtual/jre-1.6 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://jflex.de/jflex-1.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1b04ab14f5f5aaf2225398328c3953f4
+_md5_=061513f3218c91cdcec652ed74eda1b9
diff --git a/metadata/md5-cache/dev-java/jline-2.12.1-r1 b/metadata/md5-cache/dev-java/jline-2.12.1-r1
index de58f2cb5090..cde6bff5017d 100644
--- a/metadata/md5-cache/dev-java/jline-2.12.1-r1
+++ b/metadata/md5-cache/dev-java/jline-2.12.1-r1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-java/jansi:0 dev-java/jansi-native:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jline/jline2/archive/jline-2.12.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f889d613b7866d44180abd636d69b515
+_md5_=e2fa9cc9fa37b97e9b689968275f2e3b
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r1 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
index 6a63adb83312..d8782d43ee19 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bf6a8c273a08665f33c99248ac57adda
+_md5_=57600635174ab6ee787537966877caac
diff --git a/metadata/md5-cache/dev-java/jts-core-1.14 b/metadata/md5-cache/dev-java/jts-core-1.14
index 4d0ff4ceeb04..70b479e6affe 100644
--- a/metadata/md5-cache/dev-java/jts-core-1.14
+++ b/metadata/md5-cache/dev-java/jts-core-1.14
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dr-jts/jts/archive/f67d35c1da06922c8165f66a919490ee94a04649.tar.gz -> jts-1.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=210ceceb3302477f7e0d05785b98a306
+_md5_=28cb3492a135622e65e36ddbe275b946
diff --git a/metadata/md5-cache/dev-java/metadata-extractor-2.8.1 b/metadata/md5-cache/dev-java/metadata-extractor-2.8.1
index b730219bc261..c450ec91523e 100644
--- a/metadata/md5-cache/dev-java/metadata-extractor-2.8.1
+++ b/metadata/md5-cache/dev-java/metadata-extractor-2.8.1
@@ -7,7 +7,8 @@ IUSE=examples test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-java/xmpcore:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/drewnoakes/metadata-extractor/archive/2.8.1.tar.gz -> metadata-extractor-2.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ea22e4a9a121838d920895f3331e364c
+_md5_=68d314c5db9c83e05c47b8d6a0a96875
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.36 b/metadata/md5-cache/dev-java/netty-buffer-4.0.36
index ffaf09b1bf30..e7fe396efad5 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.36
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-common-4.0.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1294ec9d7c0ca2590012425f7f03b85a
+_md5_=89c0ae84c293e03c31adc64e1cc285cf
diff --git a/metadata/md5-cache/dev-java/netty-codec-4.0.36 b/metadata/md5-cache/dev-java/netty-codec-4.0.36
index 59ff463a8f42..1a058461c35e 100644
--- a/metadata/md5-cache/dev-java/netty-codec-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-codec-4.0.36
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/jboss-marshalling:0 dev-java/jzlib:1.1.3 dev-java/protobuf-java:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=29e1d97b4224e5a1cbd13d1fa7a8d7f3
+_md5_=6a6d311e6b9ae20d027c865158e39229
diff --git a/metadata/md5-cache/dev-java/netty-codec-http-4.0.36 b/metadata/md5-cache/dev-java/netty-codec-http-4.0.36
index 8d9cd1674eea..ecf03bcf7c92 100644
--- a/metadata/md5-cache/dev-java/netty-codec-http-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-codec-http-4.0.36
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-codec-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-handler-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/jboss-marshalling:0 dev-java/jzlib:1.1.3 dev-java/protobuf-java:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=520190b5dd7edc36d12ceddd77134042
+_md5_=b386785c20535defc22a013f2afc900b
diff --git a/metadata/md5-cache/dev-java/netty-common-4.0.36 b/metadata/md5-cache/dev-java/netty-common-4.0.36
index 6e70c89aef21..457e53b8a888 100644
--- a/metadata/md5-cache/dev-java/netty-common-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.36
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=93e49799117749784a4cf0d75e4ed212
+_md5_=96bbf2ce7a2afb56983723e068fd7ded
diff --git a/metadata/md5-cache/dev-java/netty-handler-4.0.36 b/metadata/md5-cache/dev-java/netty-handler-4.0.36
index a68bc210fa79..ccb0b4881b7a 100644
--- a/metadata/md5-cache/dev-java/netty-handler-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-handler-4.0.36
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-codec-4.0.36:0 ~dev-java/netty-common-4.0.36:0 ~dev-java/netty-transport-4.0.36:0 dev-java/netty-tcnative:0 dev-java/bcpkix:1.52 dev-java/bcprov:1.52 dev-java/jetty-alpn-api:0 dev-java/jetty-npn-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=870435e8e1cde2407235e6454216db4e
+_md5_=1d34721b07e6bff953acc3a4674edf54
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.36 b/metadata/md5-cache/dev-java/netty-transport-4.0.36
index e64c208a0535..fd57ef8d0107 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.36
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common-4.0.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a08db750d9247ef19d1f3cebaae63fae
+_md5_=792bca0e779f8a191331105b13a78cb0
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.7 b/metadata/md5-cache/dev-java/slf4j-api-1.7.7
index 32463dab1955..9b786cdd7f8d 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.7
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=dccd62aeb43d26e27ca1f8feb660ba66
+_md5_=6b158c1f0c35d0e8b52dfdefa665c94a
diff --git a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7 b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
index fdce0f567247..dce4b5802d2a 100644
--- a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=88bcdd78c78224103d61169f7d7bf98b
+_md5_=66f141d00d5bf009b78901610a0c0c30
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.7 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
index 88e274bea3a3..1961691950e2 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=02470128a295cf0e398636d5451db3fe
+_md5_=70a6658480b59cf45e37b110c47b38b9
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.16 b/metadata/md5-cache/dev-java/snakeyaml-1.16
index 812451380113..09a4bdc17250 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.16
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.16
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/asomov/snakeyaml/get/v1.16.tar.bz2 -> snakeyaml-1.16.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8278c06c265e08303d76fb124feb16bd
+_md5_=33b098d5af4743ac19f0be93d39ba9b5
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
index fb2e5bef6ff3..d21e30e5ee88 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/antlr/stringtemplate3/archive/3.2.1.tar.gz -> stringtemplate-3.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2d2e7f6817e7abc11a2a953ba57d4cbe
+_md5_=d9b78c0705c85c55656768fc012dc757
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.0.8 b/metadata/md5-cache/dev-java/stringtemplate-4.0.8
index 22ea37d17346..7e1940d55838 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.0.8
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.0.8
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-so
 LICENSE=BSD
 PDEPEND=>=dev-java/antlr-3.5.2:3.5
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/stringtemplate4/archive/4.0.8.tar.gz -> stringtemplate-4.0.8.tar.gz http://www.antlr3.org/download/antlr-3.5.2-complete.jar
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6ec35eecfb5a5e3c8b1cb2bef651e849
+_md5_=92b469fd10a4f6922cd3d994c7980714
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1
index 955011925436..34120dc83f9e 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/tomcat-jstl-spec:0 dev-java/tomcat-jstl-impl:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-compat-1.2.5.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0b314a1e79c47565c2ccd2d5dd28c445
+_md5_=dcc635c3cdcffc66daaafe8aeff93a6b
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
index f13aeb2fade0..67b5fadfd5bb 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-el-1.2.5.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b35c235a6d96d48e3b0b464fb588d1c8
+_md5_=00fa1805b9606fed028de49d6925d669
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
index 40ef4a97bcc3..446ecc15daca 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/xalan:0 dev-java/tomcat-jstl-spec:0 dev-java/tomcat-servlet-api:3.1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-impl-1.2.5.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3b156f83be6e54ca69e340ae6ac21b8d
+_md5_=b365317fa8e1c0976ac63feab4692d4b
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
index 45a9c49f4bb0..c3467427005b 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-spec-1.2.5.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=80680f00201543ce8406ed3ddb38ce83
+_md5_=7f15a88bdd2878df18eb75f96e0eb5d7
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.21 b/metadata/md5-cache/dev-java/tomcat-native-1.2.21
index 145e8592383c..76feb0353ea4 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.21
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.21
@@ -7,7 +7,8 @@ IUSE=static-libs test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.21/source/tomcat-native-1.2.21-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0d5b0b8ccb2dfdd6d2f037269acb6bc2
+_md5_=e8dc5264f3ee6a2ff7d8faf02c6d9a72
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.23 b/metadata/md5-cache/dev-java/tomcat-native-1.2.23
index db19a29ce3cc..6ef82de3c513 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.23
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.23
@@ -7,7 +7,8 @@ IUSE=static-libs test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.23/source/tomcat-native-1.2.23-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=187dd78f72ac40b1a58057d94f7ee39f
+_md5_=affca0784d429bba40fabc1ec16634b0
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.2 b/metadata/md5-cache/dev-java/treelayout-1.0.2
index f1f3e7a2f3c2..c80d5da8d181 100644
--- a/metadata/md5-cache/dev-java/treelayout-1.0.2
+++ b/metadata/md5-cache/dev-java/treelayout-1.0.2
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm ppc64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/abego/treelayout/archive/v1.0.2.tar.gz -> treelayout-1.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0bede0c19e35672400b1c787a3673ae6
+_md5_=87a4a3186a9279ae4d1b406884507bbd
diff --git a/metadata/md5-cache/dev-java/wstx-3.2.9-r1 b/metadata/md5-cache/dev-java/wstx-3.2.9-r1
index 68e7d23c54f3..0c8fd2339e56 100644
--- a/metadata/md5-cache/dev-java/wstx-3.2.9-r1
+++ b/metadata/md5-cache/dev-java/wstx-3.2.9-r1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/sax:0 dev-java/msv:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=3.2
 SRC_URI=mirror://gentoo/wstx-src-3.2.9.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=edb56e0437c58c79c7108df0363e1d92
+_md5_=d6724b42e4e8900b8ae230323f4d6290
diff --git a/metadata/md5-cache/dev-lang/bff-1.0.5 b/metadata/md5-cache/dev-lang/bff-1.0.5
index aeb948984f5f..5d852aeb6d26 100644
--- a/metadata/md5-cache/dev-lang/bff-1.0.5
+++ b/metadata/md5-cache/dev-lang/bff-1.0.5
@@ -5,7 +5,8 @@ HOMEPAGE=https://github.com/apankrat/bff
 IUSE=test
 KEYWORDS=amd64 arm ia64 m68k ppc ppc64 s390 sh x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apankrat/bff/archive/v1.0.5.tar.gz -> bff-1.0.5.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=68d4b698e6631d934b70aea5253fec43
+_md5_=553706f53a4ba6aae28647080abd49ce
diff --git a/metadata/md5-cache/dev-lang/ghc-8.6.4 b/metadata/md5-cache/dev-lang/ghc-8.6.4
index 5322d2467926..b2d5f09febf1 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.6.4
+++ b/metadata/md5-cache/dev-lang/ghc-8.6.4
@@ -8,7 +8,8 @@ LICENSE=BSD
 PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
 RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
 REQUIRED_USE=?? ( ghcbootstrap binary )
+RESTRICT=!test? ( test )
 SLOT=0/8.6.4
 SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.4-i686-pc-linux-gnu.tbz2 ) )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bd791484358156616af7e90385ff67e5
+_md5_=92022822b17319cfba3a7a338ffaf7ed
diff --git a/metadata/md5-cache/dev-lang/ghc-8.6.5 b/metadata/md5-cache/dev-lang/ghc-8.6.5
index 281f566b0cbd..700ef89356a2 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.6.5
+++ b/metadata/md5-cache/dev-lang/ghc-8.6.5
@@ -8,7 +8,8 @@ LICENSE=BSD
 PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
 RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
 REQUIRED_USE=?? ( ghcbootstrap binary )
+RESTRICT=!test? ( test )
 SLOT=0/8.6.5
 SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.5-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.5-i686-pc-linux-gnu.tbz2 ) )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c2e7fe18d5b62172b2f23ed92f20974f
+_md5_=823fca68090a4b22d1d9aeb9a6b328c6
diff --git a/metadata/md5-cache/dev-lang/ghc-8.8.1 b/metadata/md5-cache/dev-lang/ghc-8.8.1
index fb42624ecc45..dc3f0a19a8a3 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.8.1
+++ b/metadata/md5-cache/dev-lang/ghc-8.8.1
@@ -9,7 +9,8 @@ LICENSE=BSD
 PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
 RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( virtual/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
 REQUIRED_USE=?? ( ghcbootstrap binary )
+RESTRICT=!test? ( test )
 SLOT=0/8.8.1
 SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.8.1/ghc-8.8.1-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.8.1/ghc-8.8.1-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.1-i686-pc-linux-gnu.tbz2 ) )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=32e4426c10e41f587c598935b7e40e98
+_md5_=fa8d189568bc0c2903eb07b40c8fc98a
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.4 b/metadata/md5-cache/dev-lang/lua-5.2.4
index ba12ceaea381..132a80cdf301 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.4
+++ b/metadata/md5-cache/dev-lang/lua-5.2.4
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=MIT
 PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
+RESTRICT=!test? ( test )
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.4.tar.gz test? ( https://www.lua.org/tests/lua-5.2.2-tests.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bc0a64a99a1c24c2531f76b236f6dcbe
+_md5_=457ea0e87d3900532cc7711dc2ec8c5a
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.4-r1 b/metadata/md5-cache/dev-lang/lua-5.2.4-r1
index 935447f9f462..a353cc635780 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.4-r1
+++ b/metadata/md5-cache/dev-lang/lua-5.2.4-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=MIT
 PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
+RESTRICT=!test? ( test )
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.4.tar.gz test? ( https://www.lua.org/tests/lua-5.2.2-tests.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6519330558e9bfd3cd3bfca7abbe30c8
+_md5_=40f8d3a7791e0848da62197170ff7cf8
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.5 b/metadata/md5-cache/dev-lang/lua-5.3.5
index 085e08446116..fb8d23a36792 100644
--- a/metadata/md5-cache/dev-lang/lua-5.3.5
+++ b/metadata/md5-cache/dev-lang/lua-5.3.5
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=MIT
 PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
+RESTRICT=!test? ( test )
 SLOT=5.3
 SRC_URI=http://www.lua.org/ftp/lua-5.3.5.tar.gz test? ( https://www.lua.org/tests/lua-5.3.4-tests.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ca6b739ba345aad9fb5d22905022d644
+_md5_=288b819baced5dd8c0960d397e1e8fb3
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.5-r1 b/metadata/md5-cache/dev-lang/lua-5.3.5-r1
index c957d23e2d2a..1b6e6fac4c3e 100644
--- a/metadata/md5-cache/dev-lang/lua-5.3.5-r1
+++ b/metadata/md5-cache/dev-lang/lua-5.3.5-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=MIT
 PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
+RESTRICT=!test? ( test )
 SLOT=5.3
 SRC_URI=http://www.lua.org/ftp/lua-5.3.5.tar.gz test? ( https://www.lua.org/tests/lua-5.3.4-tests.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8a57d660bd3433103e56772e53e67f51
+_md5_=7c1bf89cf265e9dab26c6b38bad2cc03
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.06-r1 b/metadata/md5-cache/dev-lang/nqp-2018.06-r1
index cbbe14ac1c98..8f24692a540b 100644
--- a/metadata/md5-cache/dev-lang/nqp-2018.06-r1
+++ b/metadata/md5-cache/dev-lang/nqp-2018.06-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.06[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2018.06/nqp-2018.06.tar.gz -> nqp-2018.06.official.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=44f0749ca199f5b84ec620f993ec8e56
+_md5_=7b7040bf672095ebd08247d430356583
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.08-r1 b/metadata/md5-cache/dev-lang/nqp-2018.08-r1
index 07d3737a7492..6ca1646e42d0 100644
--- a/metadata/md5-cache/dev-lang/nqp-2018.08-r1
+++ b/metadata/md5-cache/dev-lang/nqp-2018.08-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.08[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2018.08/nqp-2018.08.tar.gz -> nqp-2018.08.official.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=44f0749ca199f5b84ec620f993ec8e56
+_md5_=7b7040bf672095ebd08247d430356583
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.09-r1 b/metadata/md5-cache/dev-lang/nqp-2018.09-r1
index 0c751d01f9a1..85460f29c90e 100644
--- a/metadata/md5-cache/dev-lang/nqp-2018.09-r1
+++ b/metadata/md5-cache/dev-lang/nqp-2018.09-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.09[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2018.09/nqp-2018.09.tar.gz -> nqp-2018.09.official.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=44f0749ca199f5b84ec620f993ec8e56
+_md5_=7b7040bf672095ebd08247d430356583
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.12-r1 b/metadata/md5-cache/dev-lang/nqp-2018.12-r1
index eae894fd6030..63a1a12c5cd2 100644
--- a/metadata/md5-cache/dev-lang/nqp-2018.12-r1
+++ b/metadata/md5-cache/dev-lang/nqp-2018.12-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.12[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2018.12/nqp-2018.12.tar.gz -> nqp-2018.12.official.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=44f0749ca199f5b84ec620f993ec8e56
+_md5_=7b7040bf672095ebd08247d430356583
diff --git a/metadata/md5-cache/dev-lang/nqp-2019.03-r1 b/metadata/md5-cache/dev-lang/nqp-2019.03-r1
index b0cdfa9b0e3c..eea914ddbf66 100644
--- a/metadata/md5-cache/dev-lang/nqp-2019.03-r1
+++ b/metadata/md5-cache/dev-lang/nqp-2019.03-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2019.03[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2019.03/nqp-2019.03.tar.gz -> nqp-2019.03.official.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=44f0749ca199f5b84ec620f993ec8e56
+_md5_=7b7040bf672095ebd08247d430356583
diff --git a/metadata/md5-cache/dev-lang/nqp-2019.07.1 b/metadata/md5-cache/dev-lang/nqp-2019.07.1
index 11d5cff79e7e..8be1e7e7e8d2 100644
--- a/metadata/md5-cache/dev-lang/nqp-2019.07.1
+++ b/metadata/md5-cache/dev-lang/nqp-2019.07.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2019.07.1[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2019.07.1/nqp-2019.07.1.tar.gz
 _eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multibuild	40fe59465edacd730c644ec2bc197809
-_md5_=e34c17c92d7b2b0bd96afd29bbdb22f9
+_md5_=2a3fb5562ce14e761741e9bec21a7efd
diff --git a/metadata/md5-cache/dev-lang/nqp-9999 b/metadata/md5-cache/dev-lang/nqp-9999
index cc00ec06d4cd..b55d5e11f5cc 100644
--- a/metadata/md5-cache/dev-lang/nqp-9999
+++ b/metadata/md5-cache/dev-lang/nqp-9999
@@ -9,6 +9,7 @@ LICENSE=Artistic-2
 PROPERTIES=live
 RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[clang=] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multibuild	40fe59465edacd730c644ec2bc197809
-_md5_=e34c17c92d7b2b0bd96afd29bbdb22f9
+_md5_=2a3fb5562ce14e761741e9bec21a7efd
diff --git a/metadata/md5-cache/dev-lang/polyml-5.4.1 b/metadata/md5-cache/dev-lang/polyml-5.4.1
index 63aaa647582b..98067f5d8d78 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.4.1
+++ b/metadata/md5-cache/dev-lang/polyml-5.4.1
@@ -7,7 +7,8 @@ IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
+RESTRICT=!test? ( test )
 SLOT=0/5.4.1
 SRC_URI=mirror://sourceforge/polyml/polyml.5.4.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	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_=7ab4f7e0cba6c8af9ad79a1599d41d4c
+_md5_=b22756ba109eae4e6a012e45d4d90269
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.0 b/metadata/md5-cache/dev-lang/polyml-5.5.0
index 9bee1e669e23..d64ed9165cab 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.0
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.0
@@ -7,7 +7,8 @@ IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
+RESTRICT=!test? ( test )
 SLOT=0/5.5.0
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	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	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7ff3d0ab45e01850fc71f6c7ccd2eeb7
+_md5_=58b841a83ec05e5c5c5248a0222a3b35
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.1 b/metadata/md5-cache/dev-lang/polyml-5.5.1
index ce6112d41cbc..3e334df9d738 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.1
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.1
@@ -7,7 +7,8 @@ IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
+RESTRICT=!test? ( test )
 SLOT=0/5.5.1
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8f2b67b5d597885fcdf7a2b0d89ae982
+_md5_=6ab89325f82914c2093b8a6eae551319
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.2 b/metadata/md5-cache/dev-lang/polyml-5.5.2
index c56268c78c38..6f70bcfc9947 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.2
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.2
@@ -7,7 +7,8 @@ IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
+RESTRICT=!test? ( test )
 SLOT=0/5.5.2
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db6bd08d7c7c63533e2992b347ccd85c
+_md5_=638b70af2f34e79f84f78af760249b23
diff --git a/metadata/md5-cache/dev-lang/polyml-5.6 b/metadata/md5-cache/dev-lang/polyml-5.6
index 6ff9810cce89..17404e167418 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.6
+++ b/metadata/md5-cache/dev-lang/polyml-5.6
@@ -7,7 +7,8 @@ IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
+RESTRICT=!test? ( test )
 SLOT=0/5.6
 SRC_URI=https://codeload.github.com/polyml/polyml/tar.gz/v5.6 -> polyml-5.6.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7780a1fb42044e656c4386941860f0b4
+_md5_=a35f3fb535fc086938b7234a86a8ae94
diff --git a/metadata/md5-cache/dev-lang/polyml-5.8 b/metadata/md5-cache/dev-lang/polyml-5.8
index 22dec52c7bc8..8d5fdb0ed990 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.8
+++ b/metadata/md5-cache/dev-lang/polyml-5.8
@@ -7,7 +7,8 @@ IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
+RESTRICT=!test? ( test )
 SLOT=0/5.8
 SRC_URI=https://codeload.github.com/polyml/polyml/tar.gz/v5.8 -> polyml-5.8.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0e03dbfdb8b2fcb3942dc55639968d0c
+_md5_=1db5638c49a76307451f5518fee7a641
diff --git a/metadata/md5-cache/dev-lang/rakudo-2018.06 b/metadata/md5-cache/dev-lang/rakudo-2018.06
index f7d188017c8e..9d14047ba80a 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2018.06
+++ b/metadata/md5-cache/dev-lang/rakudo-2018.06
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=~dev-lang/nqp-2018.06:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2018.06.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=34ab2cd429be00b5f90033afb65eb2e7
+_md5_=5fad7062df0bb3d3b538e819c94627cd
diff --git a/metadata/md5-cache/dev-lang/rakudo-2018.08 b/metadata/md5-cache/dev-lang/rakudo-2018.08
index 3abd18cd9d0e..84e6c630b9b1 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2018.08
+++ b/metadata/md5-cache/dev-lang/rakudo-2018.08
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=~dev-lang/nqp-2018.08:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2018.08.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=34ab2cd429be00b5f90033afb65eb2e7
+_md5_=5fad7062df0bb3d3b538e819c94627cd
diff --git a/metadata/md5-cache/dev-lang/rakudo-2018.09 b/metadata/md5-cache/dev-lang/rakudo-2018.09
index 43ca361a30ae..3ce5fdedd349 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2018.09
+++ b/metadata/md5-cache/dev-lang/rakudo-2018.09
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=~dev-lang/nqp-2018.09:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2018.09.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5d844e254540041c86498a1c015d5579
+_md5_=5fad7062df0bb3d3b538e819c94627cd
diff --git a/metadata/md5-cache/dev-lang/rakudo-2018.12 b/metadata/md5-cache/dev-lang/rakudo-2018.12
index 0c4d2fa87158..337755846175 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2018.12
+++ b/metadata/md5-cache/dev-lang/rakudo-2018.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=~dev-lang/nqp-2018.12:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2018.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=81e57345f56f7c37b853d3df44622b01
+_md5_=5fad7062df0bb3d3b538e819c94627cd
diff --git a/metadata/md5-cache/dev-lang/rakudo-2019.03 b/metadata/md5-cache/dev-lang/rakudo-2019.03
index 5466ddc67c2f..6d9eec3d674d 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2019.03
+++ b/metadata/md5-cache/dev-lang/rakudo-2019.03
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=~dev-lang/nqp-2019.03:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2019.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=81e57345f56f7c37b853d3df44622b01
+_md5_=5fad7062df0bb3d3b538e819c94627cd
diff --git a/metadata/md5-cache/dev-lang/rakudo-9999 b/metadata/md5-cache/dev-lang/rakudo-9999
index a1590cfee6f3..b3c289129a1a 100644
--- a/metadata/md5-cache/dev-lang/rakudo-9999
+++ b/metadata/md5-cache/dev-lang/rakudo-9999
@@ -8,6 +8,7 @@ LICENSE=Artistic-2
 PROPERTIES=live
 RDEPEND=~dev-lang/nqp-9999:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5039e5125d89d32a0fea33e1e85938ac
+_md5_=3b87b07a912f3fc61e3c84310714a3e2
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
index 01851fbaf4dd..2a9f4d744d8a 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
@@ -7,7 +7,8 @@ IUSE=debug minimal static-libs test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x64-macos
 LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
+RESTRICT=!test? ( test )
 SLOT=0/mozjs185
 SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-01.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=33b74e83cf30c83c094f99c31c7045c9
+_md5_=3766b212921d1a38a4bb69d9d4897ef4
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r7 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r7
index bbe4363e8ea8..534562687205 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r7
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r7
@@ -7,7 +7,8 @@ IUSE=debug minimal static-libs test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x64-macos
 LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
+RESTRICT=!test? ( test )
 SLOT=0/mozjs185
 SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-02.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0438f2e1831d0dc56e5181fdafa6de43
+_md5_=4edb7e300e64e22ba0c8d977a037b63a
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
index e6e0f49a50cf..037045ae0a64 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
@@ -7,7 +7,8 @@ IUSE=debug minimal static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos
 LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
+RESTRICT=!test? ( test )
 SLOT=0/mozjs185
 SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-02.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bb2a9aa32dc77171c4d5adcf6b1fe184
+_md5_=1076f79543b41ced97f3d89a17c43509
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.14 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.14
index 7e5dbc8ae471..8c793a9c2b5a 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.1.14
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.1.14
@@ -7,7 +7,8 @@ IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.14.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=70c536ffb2489bc355f88e238ebb32af
+_md5_=be444a494cb8a6b56239ff00c05c4607
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.15 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.15
index 1012e4ab5d46..c2e28e07af6d 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.1.15
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.1.15
@@ -7,7 +7,8 @@ IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.15.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3e24a9cce27f69b65799e5154e852a5
+_md5_=40d02a202a887b619dc083b79ff588f4
diff --git a/metadata/md5-cache/dev-lang/tcc-0.9.26-r3 b/metadata/md5-cache/dev-lang/tcc-0.9.26-r3
index 7e269140ccc5..cfed54fb2694 100644
--- a/metadata/md5-cache/dev-lang/tcc-0.9.26-r3
+++ b/metadata/md5-cache/dev-lang/tcc-0.9.26-r3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=LGPL-2.1
 RDEPEND=!dev-lang/tendra
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/tinycc/tcc-0.9.26.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fd59c2cce97abc81b715e9e93b69f082
+_md5_=ffe2bc3ee982b2488f0167f02559cf3e
diff --git a/metadata/md5-cache/dev-lang/tcc-0.9.27 b/metadata/md5-cache/dev-lang/tcc-0.9.27
index 7aad0bfa6164..a277363fc885 100644
--- a/metadata/md5-cache/dev-lang/tcc-0.9.27
+++ b/metadata/md5-cache/dev-lang/tcc-0.9.27
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=LGPL-2.1
 RDEPEND=!dev-lang/tendra
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/tinycc/tcc-0.9.27.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=90c136ff6b051f28187d9181e9f6c28c
+_md5_=674f7c4ebfb1065cf6028aaae109b844
diff --git a/metadata/md5-cache/dev-lang/tcc-9999 b/metadata/md5-cache/dev-lang/tcc-9999
index b40d4c4a2977..9fea76709234 100644
--- a/metadata/md5-cache/dev-lang/tcc-9999
+++ b/metadata/md5-cache/dev-lang/tcc-9999
@@ -7,6 +7,7 @@ IUSE=test
 LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=!dev-lang/tendra
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=06399073dc62e9b71c975fe5bf663d8d
+_md5_=41dbab10eeb42d56b95b11b1802f717a
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.9.2 b/metadata/md5-cache/dev-lang/tuprolog-2.9.2
index e4d996d1914d..f08c83001b39 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.9.2
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.9.2
@@ -7,7 +7,8 @@ IUSE=doc examples test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 RDEPEND=>=virtual/jdk-1.7:= dev-java/javassist:3 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-2.9.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2af38c2a472e5d95cb944879af55fc3a
+_md5_=d414b6dfdd9979c3c91d17934e8e8fb6
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.0.1 b/metadata/md5-cache/dev-lang/tuprolog-3.0.1
index 2cea81619d74..94da749e7ab8 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-3.0.1
+++ b/metadata/md5-cache/dev-lang/tuprolog-3.0.1
@@ -7,7 +7,8 @@ IUSE=doc examples test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3 BSD
 RDEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-3.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c8eb46faca18a091ac0a9659f33ef606
+_md5_=ebb79166a10831399ca002f29bd36528
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.1.0 b/metadata/md5-cache/dev-lang/tuprolog-3.1.0
index dc7b5e1b1fd8..f03d14f985aa 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-3.1.0
+++ b/metadata/md5-cache/dev-lang/tuprolog-3.1.0
@@ -7,7 +7,8 @@ IUSE=doc examples test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3 BSD
 RDEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-3.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2f66fcc0056bb9e2a90a449dff594b92
+_md5_=a76f48ecc9ef6d805d74631fba8ada29
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.18 b/metadata/md5-cache/dev-lang/vala-0.36.18
index d1c7af8eb8a4..1b637958b68d 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.18
+++ b/metadata/md5-cache/dev-lang/vala-0.36.18
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.18
+RESTRICT=!test? ( test )
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.18.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82c321592bd3e47aaac5d9f248c2e589
+_md5_=5ee7b028ddd8bdc737c851a46cb9bd77
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.20 b/metadata/md5-cache/dev-lang/vala-0.36.20
index 78f4eac3fb4c..15861f700d53 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.20
+++ b/metadata/md5-cache/dev-lang/vala-0.36.20
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.20
+RESTRICT=!test? ( test )
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.20.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=52cfdc8f908edbc36c66fa6245733c62
+_md5_=10b339a4e68178bb61b1515e95591792
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.14 b/metadata/md5-cache/dev-lang/vala-0.40.14
index e2ff7da160a8..b317d4cc9ff1 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.14
+++ b/metadata/md5-cache/dev-lang/vala-0.40.14
@@ -7,7 +7,8 @@ IUSE=test valadoc
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.14 valadoc? ( >=media-gfx/graphviz-2.16 )
+RESTRICT=!test? ( test )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.14.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd8d120d493f3cf5d8fe5f3b6629a1a7
+_md5_=b644742dab1b4e6524bd2bcfb41824d1
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.16 b/metadata/md5-cache/dev-lang/vala-0.40.16
index 4f287949f96b..42332eb9144f 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.16
+++ b/metadata/md5-cache/dev-lang/vala-0.40.16
@@ -7,7 +7,8 @@ IUSE=test valadoc
 KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.16 valadoc? ( >=media-gfx/graphviz-2.16 )
+RESTRICT=!test? ( test )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.16.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9bc48bb2b5bbca6da802c9365ca5a4d
+_md5_=532255a5a6c5effb097d7ace6c0a18c8
diff --git a/metadata/md5-cache/dev-lang/vala-0.42.7 b/metadata/md5-cache/dev-lang/vala-0.42.7
index bd2d9be0d497..f7b26563e420 100644
--- a/metadata/md5-cache/dev-lang/vala-0.42.7
+++ b/metadata/md5-cache/dev-lang/vala-0.42.7
@@ -7,7 +7,8 @@ IUSE=test valadoc
 KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.42.7 valadoc? ( >=media-gfx/graphviz-2.16 )
+RESTRICT=!test? ( test )
 SLOT=0.42
 SRC_URI=mirror://gnome/sources/vala/0.42/vala-0.42.7.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e57b4abaa0e413efd2d9ae83b5da66ef
+_md5_=9e4fb8e176cc1a4d7346eaa8dab69d3a
diff --git a/metadata/md5-cache/dev-lang/vala-0.44.9 b/metadata/md5-cache/dev-lang/vala-0.44.9
index 327851af97f5..00af7750ef13 100644
--- a/metadata/md5-cache/dev-lang/vala-0.44.9
+++ b/metadata/md5-cache/dev-lang/vala-0.44.9
@@ -7,7 +7,8 @@ IUSE=test valadoc
 KEYWORDS=alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.44.9 valadoc? ( >=media-gfx/graphviz-2.16 )
+RESTRICT=!test? ( test )
 SLOT=0.44
 SRC_URI=mirror://gnome/sources/vala/0.44/vala-0.44.9.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=566be02c1fe556b12113d6b2cccb17fe
+_md5_=11606765bdb5b8de6c035851749f0d3d
diff --git a/metadata/md5-cache/dev-lang/vala-0.46.3 b/metadata/md5-cache/dev-lang/vala-0.46.3
index 6603f59dab9c..cd0f622d657d 100644
--- a/metadata/md5-cache/dev-lang/vala-0.46.3
+++ b/metadata/md5-cache/dev-lang/vala-0.46.3
@@ -7,7 +7,8 @@ IUSE=test valadoc
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.46.3 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
+RESTRICT=!test? ( test )
 SLOT=0.46
 SRC_URI=mirror://gnome/sources/vala/0.46/vala-0.46.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad18c7cbe06bd52b22554bc5c348efbf
+_md5_=e2f27012f77a5daaee266cfbbd17ed63
diff --git a/metadata/md5-cache/dev-libs/appstream-0.12.7 b/metadata/md5-cache/dev-libs/appstream-0.12.7
index 8d1af1c31810..8e24adbf3c42 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.12.7
+++ b/metadata/md5-cache/dev-libs/appstream-0.12.7
@@ -8,7 +8,8 @@ IUSE=apt +introspection qt5 test
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-db/lmdb:= >=dev-libs/glib-2.54:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt5? ( dev-qt/qtcore:5 )
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.12.7.tar.xz
 _eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1572ece993de41aa69e4f8a8de6dffe9
+_md5_=0dbee0f4fa95437804d3fc89f8aabb87
diff --git a/metadata/md5-cache/dev-libs/appstream-0.12.9 b/metadata/md5-cache/dev-libs/appstream-0.12.9
index 2e0aed56532b..d9660067d0b9 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.12.9
+++ b/metadata/md5-cache/dev-libs/appstream-0.12.9
@@ -8,7 +8,8 @@ IUSE=apt doc +introspection qt5 test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-db/lmdb:= >=dev-libs/glib-2.54:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt5? ( dev-qt/qtcore:5 )
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.12.9.tar.xz
 _eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b81e41be66352a75a47121355abf7abe
+_md5_=b6d997bf6c33863f6275cdd39abd5a17
diff --git a/metadata/md5-cache/dev-libs/atcore-1.0.0 b/metadata/md5-cache/dev-libs/atcore-1.0.0
index 3f6d21c2b5e0..a91a4c902ee9 100644
--- a/metadata/md5-cache/dev-libs/atcore-1.0.0
+++ b/metadata/md5-cache/dev-libs/atcore-1.0.0
@@ -8,7 +8,8 @@ IUSE=doc gui test debug test
 KEYWORDS=~amd64
 LICENSE=|| ( LGPL-2.1+ LGPL-3 ) gui? ( GPL-3+ )
 RDEPEND=>=dev-qt/qtserialport-5.12.3:5 gui? ( >=dev-qt/qtcharts-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/atcore/1.0.0/atcore-1.0.0.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde.org	a01838c52d2168944938835b4ddca1b4	kde5	08a9f8deb4a93cc1ac407ed8ae34bd1b	kde5-functions	1487e638deaf79e369b01e6c90d1b11a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9893731f9b92e323ec9c8b42b9ce97c
+_md5_=676e423431d0472f2b653fbe33e9e2be
diff --git a/metadata/md5-cache/dev-libs/atk-2.28.1 b/metadata/md5-cache/dev-libs/atk-2.28.1
index 0ef93d975055..1e2c676696e4 100644
--- a/metadata/md5-cache/dev-libs/atk-2.28.1
+++ b/metadata/md5-cache/dev-libs/atk-2.28.1
@@ -7,7 +7,8 @@ IUSE=+introspection nls test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.28/atk-2.28.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6554e9f5f6396e06861f44e056fea97
+_md5_=5b8a96a60cfdbf92fdab410b31ae9bc6
diff --git a/metadata/md5-cache/dev-libs/aws-c-common-0.4.11 b/metadata/md5-cache/dev-libs/aws-c-common-0.4.11
index 0baeaedf8697..fff678e77b09 100644
--- a/metadata/md5-cache/dev-libs/aws-c-common-0.4.11
+++ b/metadata/md5-cache/dev-libs/aws-c-common-0.4.11
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/awslabs/aws-c-common
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-common/archive/v0.4.11.tar.gz -> aws-c-common-0.4.11.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=906ec321e54db63114f2386b14237cba
+_md5_=252d477ca490aedb3d8e190ecf00fcf0
diff --git a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3 b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3
index 05ba73065f92..65f6dc80828c 100644
--- a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3
+++ b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3
@@ -7,7 +7,8 @@ HOMEPAGE=https://github.com/awslabs/aws-c-event-stream
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-c-event-stream/archive/v0.1.3.tar.gz -> aws-c-event-stream-0.1.3.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a3391b493790e101cbfb87187a089ea1
+_md5_=607c5dc7fd750b127df1e0aed83f4802
diff --git a/metadata/md5-cache/dev-libs/aws-checksums-0.1.3 b/metadata/md5-cache/dev-libs/aws-checksums-0.1.3
index a1c23d7827dd..f5477ab931dc 100644
--- a/metadata/md5-cache/dev-libs/aws-checksums-0.1.3
+++ b/metadata/md5-cache/dev-libs/aws-checksums-0.1.3
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/awslabs/aws-checksums
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/aws-checksums/archive/v0.1.3.tar.gz -> aws-checksums-0.1.3.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d25b8d0c12fd80a38d0b0da44acd7038
+_md5_=f50b0aa0f6040df0db0524835449c8bf
diff --git a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178
index f680b7db8bcb..81d0924123e9 100644
--- a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178
+++ b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=http? ( net-misc/curl:= ) polly? ( media-sound/pulseaudio ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) dev-libs/aws-c-common dev-libs/aws-checksums dev-libs/aws-c-event-stream sys-libs/zlib 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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.7.178.tar.gz -> aws-sdk-cpp-1.7.178.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2319f580c7d49061078711209160b58b
+_md5_=900a484bf1e23721cd7098ccfefc301f
diff --git a/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205 b/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
index 0e4b58f9ae45..a712c774a7cc 100644
--- a/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
+++ b/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quinoacomputing/BoostMPLCartesianProduct/archive/aeb0266b3a89f32c390dff51cb73a454d5d7a745.tar.gz -> boost-mpl-cartesian_product-20161205.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=9769a48eec63c22a80980a98f14f80ac
+_md5_=b2e3f4caf476652d5148fcc96683cc51
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.11.2 b/metadata/md5-cache/dev-libs/c-blosc-1.11.2
index ed9db07aba8a..2fff04513f0e 100644
--- a/metadata/md5-cache/dev-libs/c-blosc-1.11.2
+++ b/metadata/md5-cache/dev-libs/c-blosc-1.11.2
@@ -7,7 +7,8 @@ IUSE=cpu_flags_x86_avx2 +lz4 +snappy static-libs test zlib zstd
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.11.2.tar.gz -> c-blosc-1.11.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ada74c8eccd1742c869592e520132e9d
+_md5_=ee70d8ba6f227c52a0c48c687a712c90
diff --git a/metadata/md5-cache/dev-libs/capnproto-0.6.0 b/metadata/md5-cache/dev-libs/capnproto-0.6.0
index 270657a61468..d4d9eb72ffee 100644
--- a/metadata/md5-cache/dev-libs/capnproto-0.6.0
+++ b/metadata/md5-cache/dev-libs/capnproto-0.6.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://capnproto.org
 IUSE=static-libs test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0/060
 SRC_URI=https://github.com/sandstorm-io/capnproto/archive/v0.6.0.tar.gz -> capnproto-0.6.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bcf1726401f41e3315aab485050d08f0
+_md5_=1aec681d65d5ee91477cec7398cb551f
diff --git a/metadata/md5-cache/dev-libs/capnproto-0.6.1 b/metadata/md5-cache/dev-libs/capnproto-0.6.1
index 8af4ad7f3564..746531b50984 100644
--- a/metadata/md5-cache/dev-libs/capnproto-0.6.1
+++ b/metadata/md5-cache/dev-libs/capnproto-0.6.1
@@ -6,7 +6,8 @@ HOMEPAGE=https://capnproto.org
 IUSE=static-libs test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0/061
 SRC_URI=https://github.com/sandstorm-io/capnproto/archive/v0.6.1.tar.gz -> capnproto-0.6.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9566ad78df36ada7face0932e07641fa
+_md5_=bfd78fa27e6b93642d9cbb6682d17a3f
diff --git a/metadata/md5-cache/dev-libs/capnproto-0.7.0 b/metadata/md5-cache/dev-libs/capnproto-0.7.0
index 64c58b6fb85a..f74a6790de41 100644
--- a/metadata/md5-cache/dev-libs/capnproto-0.7.0
+++ b/metadata/md5-cache/dev-libs/capnproto-0.7.0
@@ -8,7 +8,8 @@ IUSE=+ssl static-libs test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=ssl? ( dev-libs/openssl:0= )
+RESTRICT=!test? ( test )
 SLOT=0/070
 SRC_URI=https://github.com/sandstorm-io/capnproto/archive/v0.7.0.tar.gz -> capnproto-0.7.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4d77b79552eae8ec1b2401e7f129ab05
+_md5_=9dbeb186397f0febb1e4cc836a434830
diff --git a/metadata/md5-cache/dev-libs/cereal-1.2.1 b/metadata/md5-cache/dev-libs/cereal-1.2.1
index 1ef8c0f2addf..bcf8da22c9e5 100644
--- a/metadata/md5-cache/dev-libs/cereal-1.2.1
+++ b/metadata/md5-cache/dev-libs/cereal-1.2.1
@@ -6,7 +6,8 @@ HOMEPAGE=http://uscilab.github.io/cereal/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/USCiLab/cereal/archive/v1.2.1.tar.gz -> cereal-1.2.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=65ad45ba77e2b182b46eb802e3d675cc
+_md5_=69895f003d7bc83e64edb849d8b09cbf
diff --git a/metadata/md5-cache/dev-libs/cereal-1.2.2 b/metadata/md5-cache/dev-libs/cereal-1.2.2
index 62b3f0f3084a..f3ee931cf5dd 100644
--- a/metadata/md5-cache/dev-libs/cereal-1.2.2
+++ b/metadata/md5-cache/dev-libs/cereal-1.2.2
@@ -6,7 +6,8 @@ HOMEPAGE=http://uscilab.github.io/cereal/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz -> cereal-1.2.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad345526d77d24847f955b06730282e3
+_md5_=38241641c3a5b721f24f365a7cc0735a
diff --git a/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r3 b/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r3
index f629d182c2c9..11d2d03b2050 100644
--- a/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r3
+++ b/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r3
@@ -7,7 +7,8 @@ IUSE=doc ecore glib static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_
 KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ecore? ( dev-libs/efl ) glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/dbus-cplusplus/libdbus-c++-0.9.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=57098a805db29ac0644ee402522637d7
+_md5_=b5f269657fa8ff90c505fdf5596d990f
diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.110 b/metadata/md5-cache/dev-libs/dbus-glib-0.110
index 1a772482c80c..88769fbc72bc 100644
--- a/metadata/md5-cache/dev-libs/dbus-glib-0.110
+++ b/metadata/md5-cache/dev-libs/dbus-glib-0.110
@@ -7,7 +7,8 @@ IUSE=debug static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_m
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 AFL-2.1 )
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=12da40faddf812d7cc6dbc978936423b
+_md5_=e43fb7fa941da2b0870bcdeae6a78856
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.4.0 b/metadata/md5-cache/dev-libs/ding-libs-0.4.0
index e245d3dac7d5..7df9a4630db1 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.4.0
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.4.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://pagure.io/SSSD/ding-libs
 IUSE=test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=LGPL-3 GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.4.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e10ad19212ec18d0361263a972096f81
+_md5_=1705fdfdd9d540cb6571c546af603a03
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.5.0 b/metadata/md5-cache/dev-libs/ding-libs-0.5.0
index 0872b8b5e108..1f12a12bae20 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.5.0
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.5.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://pagure.io/SSSD/ding-libs
 IUSE=test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
 LICENSE=LGPL-3 GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.5.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f433abe8c9af6a9274dbb88e8b895dd
+_md5_=ef6b92d3e5d28e3472996bb73aa1cc51
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.6.0 b/metadata/md5-cache/dev-libs/ding-libs-0.6.0
index 5fa5fbe51092..fea16e97e1ca 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.6.0
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.6.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://pagure.io/SSSD/ding-libs
 IUSE=test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
 LICENSE=LGPL-3 GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.6.0.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f9b5f6bd9a1d30c1d2279ff7be2292a9
+_md5_=eba9d012d079d758411baaa6d62fe1b8
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.6.1 b/metadata/md5-cache/dev-libs/ding-libs-0.6.1
index e9d264da9898..5b51a799f996 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.6.1
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.6.1
@@ -6,7 +6,8 @@ HOMEPAGE=https://pagure.io/SSSD/ding-libs
 IUSE=test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux
 LICENSE=LGPL-3 GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.6.1.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bfb12b1891ffe0e9b63f4909287a2b73
+_md5_=1a29605ae94bfd77fa08dd9b8d4d874a
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.1.4-r1 b/metadata/md5-cache/dev-libs/double-conversion-3.1.4-r1
index 58ff4ce0332b..ba9a4534584d 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-3.1.4-r1
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.1.4-r1
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/google/double-conversion
 IUSE=static-libs test
 KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/google/double-conversion/archive/v3.1.4.tar.gz -> double-conversion-3.1.4.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9cb738bf6b174798dad1ba693c9e9e3
+_md5_=1bfa570424cad48dc971cf1e48b84963
diff --git a/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001 b/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001
index 37fc1e802390..2e7b7b2b6927 100644
--- a/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001
+++ b/metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-accessibility/at-spi2-core dev-libs/glib:2 dev-libs/libcroco virtual/libintl x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxklavier x11-libs/pango introspection? ( dev-libs/gobject-introspection ) libcanberra? ( media-libs/libcanberra[gtk3(+)] ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) xtest? ( x11-libs/libXtst )
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ueno/eekboard/archive/e212262f29e022bdf7047861263ceea0c373e916.tar.gz -> eekboard-1.0.8_p20121001.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24a3e5d242dae36615e4268ef9bd52a0
+_md5_=4b60b3fcbbd011970a34a0ea3fdfcf25
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-1.11.0 b/metadata/md5-cache/dev-libs/flatbuffers-1.11.0
index f5949a9f876f..2059ef98731e 100644
--- a/metadata/md5-cache/dev-libs/flatbuffers-1.11.0
+++ b/metadata/md5-cache/dev-libs/flatbuffers-1.11.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://google.github.io/flatbuffers/
 IUSE=static-libs test
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/flatbuffers/archive/v1.11.0.tar.gz -> flatbuffers-1.11.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=257fa5bbe747b20154ff302654e97ad7
+_md5_=2e85600576628d08c8205bfadcc6b681
diff --git a/metadata/md5-cache/dev-libs/folks-0.11.4-r1 b/metadata/md5-cache/dev-libs/folks-0.11.4-r1
index 849bb8e15d6f..1afa74197f70 100644
--- a/metadata/md5-cache/dev-libs/folks-0.11.4-r1
+++ b/metadata/md5-cache/dev-libs/folks-0.11.4-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=|| ( dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) >=dev-libs/glib-2.40:2 dev-libs/dbus-glib >=dev-libs/gobject-introspection-1.30:= >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:0= sys-libs/readline:0= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] ) telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] ) tracker? ( >=app-misc/tracker-1:0= ) net-im/telepathy-mission-control
 REQUIRED_USE=bluetooth? ( eds )
+RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=mirror://gnome/sources/folks/0.11/folks-0.11.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4cbe652d8e00b1677a895345a0d69bef
+_md5_=68018453c612ef0287419600bd8964ed
diff --git a/metadata/md5-cache/dev-libs/gjs-1.48.7 b/metadata/md5-cache/dev-libs/gjs-1.48.7
index 66edaecc168e..c3a009a63a73 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.48.7
+++ b/metadata/md5-cache/dev-libs/gjs-1.48.7
@@ -7,7 +7,8 @@ IUSE=+cairo examples gtk test test
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.52.1 >=dev-libs/gobject-introspection-1.52.1:= sys-libs/readline:0= dev-lang/spidermonkey:38 virtual/libffi:= cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.48/gjs-1.48.7.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c093f82817d4be3d3d197291c58dec5
+_md5_=baa1a796959be765349c3eb69e1da662
diff --git a/metadata/md5-cache/dev-libs/glib-2.58.3-r1 b/metadata/md5-cache/dev-libs/glib-2.58.3-r1
index 1d7ba70adff7..effc4d1ac774 100644
--- a/metadata/md5-cache/dev-libs/glib-2.58.3-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.58.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh s
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.58.3 >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-util/gdbus-codegen-2.58.3 virtual/libelf:0= ) >=dev-util/glib-utils-2.58.3
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.58/glib-2.58.3.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae4e5bb9ec88a008cfc54f9406f95d32
+_md5_=041aa04404d19643f2f9a46bc0486f4b
diff --git a/metadata/md5-cache/dev-libs/glib-2.60.6 b/metadata/md5-cache/dev-libs/glib-2.60.6
index a3bf08e4c1e7..2de376e3b6a1 100644
--- a/metadata/md5-cache/dev-libs/glib-2.60.6
+++ b/metadata/md5-cache/dev-libs/glib-2.60.6
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.60.6 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) virtual/libelf:0= fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.60/glib-2.60.6.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=684b8fa39a6a09646df246853d91e282
+_md5_=590bb00ca0b8301cff4ba895485cc605
diff --git a/metadata/md5-cache/dev-libs/glib-2.60.7 b/metadata/md5-cache/dev-libs/glib-2.60.7
index 92959f62324a..d90a37ecbbd0 100644
--- a/metadata/md5-cache/dev-libs/glib-2.60.7
+++ b/metadata/md5-cache/dev-libs/glib-2.60.7
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~s
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.60.7 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) virtual/libelf:0= fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.60/glib-2.60.7.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5009f3f7279830d06ce101e8f005c849
+_md5_=34fe681c0fefa57a5c8ed2a732b377fa
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.56.1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.56.1
index ceafa90ad9d3..a0215734dba7 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.56.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.56.1
@@ -9,7 +9,8 @@ LICENSE=LGPL-2+ GPL-2+
 PDEPEND=cairo? ( x11-libs/cairo[glib] )
 RDEPEND=>=dev-libs/gobject-introspection-common-1.56.1 >=dev-libs/glib-2.56.1:2 doctool? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) test? ( cairo )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.56/gobject-introspection-1.56.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c0f7cfe5fa5f51770fa6f43c5912694
+_md5_=a17f2832d3b1e1cc9248c7114c810d30
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.58.3 b/metadata/md5-cache/dev-libs/gobject-introspection-1.58.3
index a70334ab2622..8bd475b23ab3 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.58.3
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.58.3
@@ -9,7 +9,8 @@ LICENSE=LGPL-2+ GPL-2+
 PDEPEND=cairo? ( x11-libs/cairo[glib] )
 RDEPEND=>=dev-libs/gobject-introspection-common-1.58.3 >=dev-libs/glib-2.58.0:2 doctool? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) test? ( cairo )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.58/gobject-introspection-1.58.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1d51f6c88f9def3abdeb453860f4a53
+_md5_=7c6cb97323f6f119e144d920711861ac
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2 b/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2
index 26b53ba6b96a..5637f333f622 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2
@@ -9,7 +9,8 @@ LICENSE=LGPL-2+ GPL-2+
 PDEPEND=cairo? ( x11-libs/cairo[glib] )
 RDEPEND=>=dev-libs/gobject-introspection-common-1.60.2 >=dev-libs/glib-2.58.0:2 doctool? ( dev-python/mako[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/markdown[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 python_single_target_python3_5? ( dev-lang/python:3.5[xml] >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) test? ( cairo )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.60/gobject-introspection-1.60.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a5362f382769894010f9610a51ab6c8e
+_md5_=f51819452dbe4deb15ef0dc623e77826
diff --git a/metadata/md5-cache/dev-libs/gumbo-0.10.1 b/metadata/md5-cache/dev-libs/gumbo-0.10.1
index a667e2c7f636..beec0f5af2d8 100644
--- a/metadata/md5-cache/dev-libs/gumbo-0.10.1
+++ b/metadata/md5-cache/dev-libs/gumbo-0.10.1
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/google/gumbo-parser#readme
 IUSE=doc test
 KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz -> gumbo-0.10.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f9d78ecac706fd1bdeca8e35cb354de8
+_md5_=8ac5a9b9d77982030944ac12cc0f0154
diff --git a/metadata/md5-cache/dev-libs/hiredis-0.13.3 b/metadata/md5-cache/dev-libs/hiredis-0.13.3
index d71da1191f36..bebced88c035 100644
--- a/metadata/md5-cache/dev-libs/hiredis-0.13.3
+++ b/metadata/md5-cache/dev-libs/hiredis-0.13.3
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/redis/hiredis
 IUSE=examples static-libs test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0/0.13
 SRC_URI=https://github.com/redis/hiredis/archive/v0.13.3.tar.gz -> hiredis-0.13.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9a5d6165b4ad8f786b476c8c2e023506
+_md5_=b9e9f01fa3e933722d3cc0b0df501de9
diff --git a/metadata/md5-cache/dev-libs/hiredis-0.14.0 b/metadata/md5-cache/dev-libs/hiredis-0.14.0
index 5796f18acda2..588a2ffb84ad 100644
--- a/metadata/md5-cache/dev-libs/hiredis-0.14.0
+++ b/metadata/md5-cache/dev-libs/hiredis-0.14.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/redis/hiredis
 IUSE=examples static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0/0.14
 SRC_URI=https://github.com/redis/hiredis/archive/v0.14.0.tar.gz -> hiredis-0.14.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=45a2b3ef8b8cc54f373473ade22a64f9
+_md5_=232628c0270de870bbca526cb28125ec
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.3.0 b/metadata/md5-cache/dev-libs/leatherman-1.3.0
index d58a8bdafc4d..fbc6a4727e80 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.3.0
+++ b/metadata/md5-cache/dev-libs/leatherman-1.3.0
@@ -7,7 +7,8 @@ IUSE=debug test
 KEYWORDS=amd64 ~arm hppa ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=net-misc/curl
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.3.0.tar.gz -> leatherman-1.3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c4fa1470d5b71709629622851b8ea10
+_md5_=aa7575e1472009e418d7dd16756642a7
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.8.0 b/metadata/md5-cache/dev-libs/leatherman-1.8.0
index 8f0fd11069fb..f147b64185da 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.8.0
+++ b/metadata/md5-cache/dev-libs/leatherman-1.8.0
@@ -7,7 +7,8 @@ IUSE=debug static-libs test
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=net-misc/curl
+RESTRICT=!test? ( test )
 SLOT=0/1.8.0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.8.0.tar.gz -> leatherman-1.8.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3084cc0627123365db2c883337ddec3a
+_md5_=5464bed931ef3b8ac1c99cc043e161f9
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.9.0 b/metadata/md5-cache/dev-libs/leatherman-1.9.0
index db3425f4856a..2d792b29dccf 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.9.0
+++ b/metadata/md5-cache/dev-libs/leatherman-1.9.0
@@ -7,7 +7,8 @@ IUSE=debug static-libs test
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=net-misc/curl
+RESTRICT=!test? ( test )
 SLOT=0/1.9.0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.9.0.tar.gz -> leatherman-1.9.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3084cc0627123365db2c883337ddec3a
+_md5_=5464bed931ef3b8ac1c99cc043e161f9
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.9.1 b/metadata/md5-cache/dev-libs/leatherman-1.9.1
index f63cb486cc10..cf4a159190fb 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.9.1
+++ b/metadata/md5-cache/dev-libs/leatherman-1.9.1
@@ -7,7 +7,8 @@ IUSE=debug static-libs test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=net-misc/curl
+RESTRICT=!test? ( test )
 SLOT=0/1.9.1
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.9.1.tar.gz -> leatherman-1.9.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a2c05a04c8a4f1251b8cf5358ed625b
+_md5_=4dd7ba4a59c43e1ebf8b2200abe76a22
diff --git a/metadata/md5-cache/dev-libs/leveldb-1.20 b/metadata/md5-cache/dev-libs/leveldb-1.20
index 5b9a3deb4c93..8eae62584244 100644
--- a/metadata/md5-cache/dev-libs/leveldb-1.20
+++ b/metadata/md5-cache/dev-libs/leveldb-1.20
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=tcmalloc? ( dev-util/google-perftools ) snappy? ( app-arch/snappy:= )
 REQUIRED_USE=snappy? ( !static-libs )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/leveldb/archive/v1.20.tar.gz -> leveldb-1.20.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3bfe8b719cd734f95b0287718f766563
+_md5_=48bc928e537d93dca61cb7b4c1aadd86
diff --git a/metadata/md5-cache/dev-libs/libaio-0.3.110 b/metadata/md5-cache/dev-libs/libaio-0.3.110
index 4c6061183307..777b4a378462 100644
--- a/metadata/md5-cache/dev-libs/libaio-0.3.110
+++ b/metadata/md5-cache/dev-libs/libaio-0.3.110
@@ -5,7 +5,8 @@ HOMEPAGE=http://lse.sourceforge.net/io/aio.html
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/liba/libaio/libaio_0.3.110.orig.tar.gz -> libaio-0.3.110.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=138b032df3b69ee0331eea1bba29a2dc
+_md5_=bfb02e414d1cce0cf2709d46acfaca96
diff --git a/metadata/md5-cache/dev-libs/libaio-0.3.111 b/metadata/md5-cache/dev-libs/libaio-0.3.111
index 2c9c7eb22a59..7930a357e53b 100644
--- a/metadata/md5-cache/dev-libs/libaio-0.3.111
+++ b/metadata/md5-cache/dev-libs/libaio-0.3.111
@@ -5,7 +5,8 @@ HOMEPAGE=https://pagure.io/libaio
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pagure.io/libaio/archive/libaio-0.3.111/libaio-0.3.111.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=71ef74ceac56b42c61a4d72050f9aa82
+_md5_=b606707e3fcedf26d6917724330c0651
diff --git a/metadata/md5-cache/dev-libs/libaio-0.3.112 b/metadata/md5-cache/dev-libs/libaio-0.3.112
index 68b10db2f672..a2a8e664528d 100644
--- a/metadata/md5-cache/dev-libs/libaio-0.3.112
+++ b/metadata/md5-cache/dev-libs/libaio-0.3.112
@@ -5,7 +5,8 @@ HOMEPAGE=https://pagure.io/libaio
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=f1c870a86b28440257841a55b0add0df
+_md5_=f298adbfa9b35706ec7adb78087c95ae
diff --git a/metadata/md5-cache/dev-libs/libaio-9999 b/metadata/md5-cache/dev-libs/libaio-9999
index 8ee46437d698..4cde531fce5d 100644
--- a/metadata/md5-cache/dev-libs/libaio-9999
+++ b/metadata/md5-cache/dev-libs/libaio-9999
@@ -6,6 +6,7 @@ HOMEPAGE=https://pagure.io/libaio
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
 LICENSE=LGPL-2
 PROPERTIES=live
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=f1c870a86b28440257841a55b0add0df
+_md5_=f298adbfa9b35706ec7adb78087c95ae
diff --git a/metadata/md5-cache/dev-libs/libcdio-0.93 b/metadata/md5-cache/dev-libs/libcdio-0.93
index 6b3dd4e62185..0428b34b4d54 100644
--- a/metadata/md5-cache/dev-libs/libcdio-0.93
+++ b/metadata/md5-cache/dev-libs/libcdio-0.93
@@ -7,7 +7,8 @@ IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mi
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=mirror://gnu/libcdio/libcdio-0.93.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=948fa38e1a80a07efd78f90021a34d49
+_md5_=0abbfb2378702e49976045829b053009
diff --git a/metadata/md5-cache/dev-libs/libcdio-0.94-r1 b/metadata/md5-cache/dev-libs/libcdio-0.94-r1
index d6f237628613..9f1a4a2a0dc9 100644
--- a/metadata/md5-cache/dev-libs/libcdio-0.94-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-0.94-r1
@@ -7,7 +7,8 @@ IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mi
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=mirror://gnu/libcdio/libcdio-0.94.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=91b51013426b1ef02010e7c312364226
+_md5_=cbc2776561ab8e175d1e311d43ed2ef0
diff --git a/metadata/md5-cache/dev-libs/libcdio-1.1.0 b/metadata/md5-cache/dev-libs/libcdio-1.1.0
index f142e72a4888..312596e98d16 100644
--- a/metadata/md5-cache/dev-libs/libcdio-1.1.0
+++ b/metadata/md5-cache/dev-libs/libcdio-1.1.0
@@ -7,7 +7,8 @@ IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mi
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0/17
 SRC_URI=mirror://gnu/libcdio/libcdio-1.1.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4cb9c93c4391a6f4ce74e5f27535f4bf
+_md5_=8b2f474cba20713433c9bab5d7f40e88
diff --git a/metadata/md5-cache/dev-libs/libcdio-2.0.0 b/metadata/md5-cache/dev-libs/libcdio-2.0.0
index e91d89a78905..382302506928 100644
--- a/metadata/md5-cache/dev-libs/libcdio-2.0.0
+++ b/metadata/md5-cache/dev-libs/libcdio-2.0.0
@@ -7,7 +7,8 @@ IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mi
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=mirror://gnu/libcdio/libcdio-2.0.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=449eb15c866d927f84d8ff0e558a6c32
+_md5_=f07697afa77ad7b2dc0fa3011d84bff9
diff --git a/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1 b/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
index 83c93dffd222..8311d84eae92 100644
--- a/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
@@ -7,7 +7,8 @@ IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mi
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=mirror://gnu/libcdio/libcdio-2.0.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5d890e78debe5169cac5ee14178eb93a
+_md5_=81ed53814c366494702f57cc142fe1e9
diff --git a/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1 b/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
index 87b511cee0ae..c7c6332c06e2 100644
--- a/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
@@ -8,7 +8,8 @@ IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mi
 KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=mirror://gnu/libcdio/libcdio-2.1.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9728aaea4ba214130aad8ee913f7c13f
+_md5_=632e01a84384f7d1830075c5ccfd5da1
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.41-r5 b/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
index 28f3d2f59cc7..976997750cb1 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=pam? ( sys-libs/pam )
 REQUIRED_USE=daemon? ( tools )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.41/libcgroup-0.41.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cd5003f3f5fb19c7add64050f79ce82d
+_md5_=e728fe30c208c968426de6d0be7d6932
diff --git a/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1 b/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1
index ff73d008d582..338ca4896d48 100644
--- a/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1
+++ b/metadata/md5-cache/dev-libs/libcroco-0.6.12-r1
@@ -7,7 +7,8 @@ IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0.6
 SRC_URI=mirror://gnome/sources/libcroco/0.6/libcroco-0.6.12.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=06d1ca5ba19323f14c0939ccfaa7d811
+_md5_=59a885e00f8262d6054820c67f2e269f
diff --git a/metadata/md5-cache/dev-libs/libcroco-0.6.13 b/metadata/md5-cache/dev-libs/libcroco-0.6.13
index 28c014a7bc5d..5aa345d1c5bd 100644
--- a/metadata/md5-cache/dev-libs/libcroco-0.6.13
+++ b/metadata/md5-cache/dev-libs/libcroco-0.6.13
@@ -7,7 +7,8 @@ IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0.6
 SRC_URI=mirror://gnome/sources/libcroco/0.6/libcroco-0.6.13.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d226844bb880815b26a15a30925bf4e
+_md5_=c65f5f4a40455d39637f90ebd4ee26f3
diff --git a/metadata/md5-cache/dev-libs/libcss-0.8.0-r1 b/metadata/md5-cache/dev-libs/libcss-0.8.0-r1
index e0a927026b99..a58d81c17eee 100644
--- a/metadata/md5-cache/dev-libs/libcss-0.8.0-r1
+++ b/metadata/md5-cache/dev-libs/libcss-0.8.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~m68k-mint
 LICENSE=MIT
 RDEPEND=>=dev-libs/libparserutils-0.2.1-r1 >=dev-libs/libwapcaplet-0.4.0
+RESTRICT=!test? ( test )
 SLOT=0/0.8.0
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libcss-0.8.0-src.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=874b89e8df469595ed2f2627f624cffe
+_md5_=eaaba273fb0cd1809753640d99969756
diff --git a/metadata/md5-cache/dev-libs/libdynd-0.7.2 b/metadata/md5-cache/dev-libs/libdynd-0.7.2
index acd207ea119f..693d45b97585 100644
--- a/metadata/md5-cache/dev-libs/libdynd-0.7.2
+++ b/metadata/md5-cache/dev-libs/libdynd-0.7.2
@@ -7,7 +7,8 @@ IUSE=cuda doc fftw mkl test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-libs/c-blosc:0= cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 )
+RESTRICT=!test? ( test )
 SLOT=0/0.7.2
 SRC_URI=https://github.com/libdynd/libdynd/archive/v0.7.2.tar.gz -> libdynd-0.7.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=393202cfb89bfbc728a0880769e1ea2c
+_md5_=69a2fd32d09251de54936cbf6e8f39d8
diff --git a/metadata/md5-cache/dev-libs/libestr-0.1.10 b/metadata/md5-cache/dev-libs/libestr-0.1.10
index 288e02e975fb..c7e95d49f478 100644
--- a/metadata/md5-cache/dev-libs/libestr-0.1.10
+++ b/metadata/md5-cache/dev-libs/libestr-0.1.10
@@ -6,7 +6,8 @@ HOMEPAGE=https://libestr.adiscon.com/
 IUSE=debug static-libs test
 KEYWORDS=amd64 arm arm64 hppa x86
 LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libestr.adiscon.com/files/download/libestr-0.1.10.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1f23077055ca93bb74e3ee1a5834476a
+_md5_=ed8f5fc34b8e0bfbd8be4a4c657dd184
diff --git a/metadata/md5-cache/dev-libs/libestr-0.1.11 b/metadata/md5-cache/dev-libs/libestr-0.1.11
index 0e1d5e321170..7ebd108b4309 100644
--- a/metadata/md5-cache/dev-libs/libestr-0.1.11
+++ b/metadata/md5-cache/dev-libs/libestr-0.1.11
@@ -6,7 +6,8 @@ HOMEPAGE=https://libestr.adiscon.com/
 IUSE=debug static-libs test
 KEYWORDS=amd64 arm ~arm64 hppa x86
 LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libestr.adiscon.com/files/download/libestr-0.1.11.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b247b43d901e31082a3a444061c103d6
+_md5_=7ceb565fbc4d7c790b1881e63b01b0d2
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.11 b/metadata/md5-cache/dev-libs/libevent-2.1.11
index 67c785659d9b..61a841f006b1 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.11
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.11
@@ -7,7 +7,8 @@ IUSE=debug libressl +ssl static-libs test +threads abi_x86_32 abi_x86_64 abi_x86
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !<=dev-libs/9libs-1.0
+RESTRICT=!test? ( test )
 SLOT=0/2.1-7
 SRC_URI=https://github.com/libevent/libevent/releases/download/release-2.1.11-stable/libevent-2.1.11-stable.tar.gz -> libevent-2.1.11.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ef23b7d6dad39a57262ffa32c5eb97e2
+_md5_=5e2b44a8fa76e39eaa2e7b84aae13d1e
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.8 b/metadata/md5-cache/dev-libs/libevent-2.1.8
index 8cd5212f5548..4107fcbada20 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.8
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.8
@@ -7,7 +7,8 @@ IUSE=debug libressl +ssl static-libs test +threads abi_x86_32 abi_x86_64 abi_x86
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !<=dev-libs/9libs-1.0
+RESTRICT=!test? ( test )
 SLOT=0/2.1-6
 SRC_URI=https://github.com/libevent/libevent/releases/download/release-2.1.8-stable/libevent-2.1.8-stable.tar.gz -> libevent-2.1.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ff1accdaf9ff6544c43218d3bcd5b7b9
+_md5_=a490179ab988b245eb5501f8134331bf
diff --git a/metadata/md5-cache/dev-libs/libfmt-5.3.0 b/metadata/md5-cache/dev-libs/libfmt-5.3.0
index f04116d97aec..69047b953a5a 100644
--- a/metadata/md5-cache/dev-libs/libfmt-5.3.0
+++ b/metadata/md5-cache/dev-libs/libfmt-5.3.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/fmtlib/fmt
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD-2
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/fmtlib/fmt/archive/5.3.0.tar.gz -> libfmt-5.3.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4ae1d42370a889f0a3d3572e25cbf0d5
+_md5_=f1c12f057166649e3aac7f4a13eadc79
diff --git a/metadata/md5-cache/dev-libs/libfmt-6.0.0 b/metadata/md5-cache/dev-libs/libfmt-6.0.0
index cd54fba736ad..180bcc617eb6 100644
--- a/metadata/md5-cache/dev-libs/libfmt-6.0.0
+++ b/metadata/md5-cache/dev-libs/libfmt-6.0.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/fmtlib/fmt
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/fmtlib/fmt/archive/6.0.0.tar.gz -> libfmt-6.0.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=176fc558e155c388091db775d264b293
+_md5_=230377b4af00a869ef5f5de278f1b8a2
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.8 b/metadata/md5-cache/dev-libs/libgdata-0.17.8
index 1b7cdc690240..1ccc958393fa 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.17.8
+++ b/metadata/md5-cache/dev-libs/libgdata-0.17.8
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38.0:2 >=dev-libs/json-glib-0.15 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.55.90:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=gnome-online-accounts? ( crypt ) vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.8.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=697804b84ea03a764c7b5451e0492520
+_md5_=2f648248a3c91f43aa1ecc6ab41a7b36
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1 b/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
index ac7e76125368..e613bc977740 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
+++ b/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.55.90:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=gnome-online-accounts? ( crypt ) vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.9.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=884716bb6c4e73bf57d9806cefa1190a
+_md5_=0dea6601c193647c4461c521a169cc15
diff --git a/metadata/md5-cache/dev-libs/libgpiod-1.4.1 b/metadata/md5-cache/dev-libs/libgpiod-1.4.1
index 1f496269786f..f8d8ace13689 100644
--- a/metadata/md5-cache/dev-libs/libgpiod-1.4.1
+++ b/metadata/md5-cache/dev-libs/libgpiod-1.4.1
@@ -5,7 +5,8 @@ HOMEPAGE=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/
 IUSE=static-libs +tools cxx python test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.4.1.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e7cd8d375e05114beb2df3da2aa9a7b0
+_md5_=867b3cb72c0cd55c44ef3e119293ea09
diff --git a/metadata/md5-cache/dev-libs/libgpuarray-0.6.0 b/metadata/md5-cache/dev-libs/libgpuarray-0.6.0
index b2770e43573c..a2f7e7e22c00 100644
--- a/metadata/md5-cache/dev-libs/libgpuarray-0.6.0
+++ b/metadata/md5-cache/dev-libs/libgpuarray-0.6.0
@@ -7,7 +7,8 @@ IUSE=cuda doc opencl static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=cuda? ( amd64? ( >=dev-util/nvidia-cuda-toolkit-7 ) ) opencl? ( virtual/opencl || ( sci-libs/clblast sci-libs/clblas ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Theano/libgpuarray/archive/v0.6.0.tar.gz -> libgpuarray-0.6.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0099c1b95f0d8a767fb987f86c552ffe
+_md5_=32d3f31f419762dd6d3a4f5f305d87d5
diff --git a/metadata/md5-cache/dev-libs/libgpuarray-0.6.7 b/metadata/md5-cache/dev-libs/libgpuarray-0.6.7
index 5dfe316f2e03..c4bb1d3cac5e 100644
--- a/metadata/md5-cache/dev-libs/libgpuarray-0.6.7
+++ b/metadata/md5-cache/dev-libs/libgpuarray-0.6.7
@@ -7,7 +7,8 @@ IUSE=cuda doc opencl static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=cuda? ( amd64? ( >=dev-util/nvidia-cuda-toolkit-7 ) ) opencl? ( virtual/opencl || ( sci-libs/clblast sci-libs/clblas ) )
+RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/Theano/libgpuarray/archive/v0.6.7.tar.gz -> libgpuarray-0.6.7.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca3adc4acc94d4ff54470159a0e8d682
+_md5_=441f35f32a96ea9fc3a44881e0bebcb9
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.5 b/metadata/md5-cache/dev-libs/libical-3.0.5
index 6c2d95b8a257..9c7c269c27fe 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.5
+++ b/metadata/md5-cache/dev-libs/libical-3.0.5
@@ -8,7 +8,8 @@ IUSE=berkdb doc examples glib static-libs test
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) glib? ( dev-libs/glib:2 dev-libs/libxml2:2 ) sys-libs/timezone-data
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.5/libical-3.0.5.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=12689fa24f5c7a7975a6607b0bb2c564
+_md5_=27a1ab679f27b2074242a5f4a5a5fa7e
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.6 b/metadata/md5-cache/dev-libs/libical-3.0.6
index d84f66834f75..c79f79b53b09 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.6
+++ b/metadata/md5-cache/dev-libs/libical-3.0.6
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) introspection? ( dev-libs/glib:2 ) sys-libs/timezone-data
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.6/libical-3.0.6.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b5b841adb9d1472ee86f0721436aef4
+_md5_=92a992ef8a3ce5aabe8e5f9ad487b12b
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
index 6116b85c72fd..e17f91668331 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
@@ -7,7 +7,8 @@ IUSE=test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_m
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.18:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=af7fde7ed5b88029728ec895a2699443
+_md5_=559b488ec2f6653689b2c21725df941f
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
index 547c075d1f24..90f5a452fbf7 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
@@ -7,7 +7,8 @@ IUSE=test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_m
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=71540c4ac93a81de667a51794e541bcd
+_md5_=011f2aaef55214861a29b4050536c5f1
diff --git a/metadata/md5-cache/dev-libs/liblognorm-2.0.5 b/metadata/md5-cache/dev-libs/liblognorm-2.0.5
index 46d2fe254b6c..fb7a9f2a410b 100644
--- a/metadata/md5-cache/dev-libs/liblognorm-2.0.5
+++ b/metadata/md5-cache/dev-libs/liblognorm-2.0.5
@@ -7,7 +7,8 @@ IUSE=debug doc static-libs test
 KEYWORDS=amd64 arm ~arm64 hppa x86 ~amd64-linux
 LICENSE=LGPL-2.1 Apache-2.0
 RDEPEND=>=dev-libs/libestr-0.1.3 >=dev-libs/libfastjson-0.99.2:=
+RESTRICT=!test? ( test )
 SLOT=0/5.1.0
 SRC_URI=https://www.liblognorm.com/files/download/liblognorm-2.0.5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=91951d038f953822ceacc7db2af1a21a
+_md5_=57080db210c3822382481439fb4a1517
diff --git a/metadata/md5-cache/dev-libs/liblognorm-2.0.6 b/metadata/md5-cache/dev-libs/liblognorm-2.0.6
index 93cca57a1a50..1cf3b2a0680f 100644
--- a/metadata/md5-cache/dev-libs/liblognorm-2.0.6
+++ b/metadata/md5-cache/dev-libs/liblognorm-2.0.6
@@ -7,7 +7,8 @@ IUSE=debug doc static-libs test
 KEYWORDS=amd64 arm ~arm64 hppa x86 ~amd64-linux
 LICENSE=LGPL-2.1 Apache-2.0
 RDEPEND=>=dev-libs/libestr-0.1.3 >=dev-libs/libfastjson-0.99.2:=
+RESTRICT=!test? ( test )
 SLOT=0/5.1.0
 SRC_URI=https://www.liblognorm.com/files/download/liblognorm-2.0.6.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=91951d038f953822ceacc7db2af1a21a
+_md5_=57080db210c3822382481439fb4a1517
diff --git a/metadata/md5-cache/dev-libs/libmodbus-3.1.4 b/metadata/md5-cache/dev-libs/libmodbus-3.1.4
index 3c2b0e14eba9..f999d6362bf2 100644
--- a/metadata/md5-cache/dev-libs/libmodbus-3.1.4
+++ b/metadata/md5-cache/dev-libs/libmodbus-3.1.4
@@ -6,6 +6,7 @@ HOMEPAGE=https://libmodbus.org/
 IUSE=static-libs test doc
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libmodbus.org/releases/libmodbus-3.1.4.tar.gz
-_md5_=9c24768b9a5b7d6fefb64e1914e9b439
+_md5_=ce8d958dbddab0f670e9631e58024372
diff --git a/metadata/md5-cache/dev-libs/libnsfb-0.2.0-r1 b/metadata/md5-cache/dev-libs/libnsfb-0.2.0-r1
index 3b5bd6917203..fb19d7bc8b85 100644
--- a/metadata/md5-cache/dev-libs/libnsfb-0.2.0-r1
+++ b/metadata/md5-cache/dev-libs/libnsfb-0.2.0-r1
@@ -7,7 +7,8 @@ IUSE=sdl test vnc wayland xcb
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64
 LICENSE=MIT
 RDEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4 ) vnc? ( >=net-libs/libvncserver-0.9.9-r2 ) wayland? ( >=dev-libs/wayland-1.0.6 ) xcb? ( >=x11-libs/libxcb-1.9.1 >=x11-libs/xcb-util-0.3.9-r1 >=x11-libs/xcb-util-image-0.3.9-r1 >=x11-libs/xcb-util-keysyms-0.3.9-r1 )
+RESTRICT=!test? ( test )
 SLOT=0/0.2.0
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libnsfb-0.2.0-src.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=efbc89afea87b85b04f79e147072240b
+_md5_=c3964ea4ce3fa23e84a02e137893de68
diff --git a/metadata/md5-cache/dev-libs/libofx-0.9.15 b/metadata/md5-cache/dev-libs/libofx-0.9.15
index fcf9ace16ef6..94cc2ae9de78 100644
--- a/metadata/md5-cache/dev-libs/libofx-0.9.15
+++ b/metadata/md5-cache/dev-libs/libofx-0.9.15
@@ -8,7 +8,8 @@ IUSE=static-libs test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
+RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/libofx/libofx/archive/0.9.15.tar.gz -> libofx-0.9.15.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6d692e703bb43dfd100d89b5b1469a9e
+_md5_=ca58c25fd0807c04dfa8d2fef4f78b12
diff --git a/metadata/md5-cache/dev-libs/liboil-0.3.17-r2 b/metadata/md5-cache/dev-libs/liboil-0.3.17-r2
index 72e543ed30a6..2802f37d168d 100644
--- a/metadata/md5-cache/dev-libs/liboil-0.3.17-r2
+++ b/metadata/md5-cache/dev-libs/liboil-0.3.17-r2
@@ -7,7 +7,8 @@ IUSE=+examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 a
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=examples? ( dev-libs/glib:2 )
+RESTRICT=!test? ( test )
 SLOT=0.3
 SRC_URI=https://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0e39cb89ad42e218c617aa8130960cf6
+_md5_=edbb9c54f8b5eba76b1b34fe6c2523da
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.3 b/metadata/md5-cache/dev-libs/libparserutils-0.2.3
index d12e4c30267e..7f87ae0688dc 100644
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.3
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.2.3
@@ -6,7 +6,8 @@ HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
 IUSE=iconv test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 debug static-libs
 KEYWORDS=amd64 arm ~ppc x86 ~m68k-mint
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0/0.2.3
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libparserutils-0.2.3-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	45009f983cea2d915d6977508b125099	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=55caa5534243603bfd20c2a9e8e9061f
+_md5_=b65ba4326da6bc768497f2ed50be8e23
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1 b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
index e0673ac3ac16..16b689dfbf07 100644
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
@@ -6,7 +6,8 @@ HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
 IUSE=iconv test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~m68k-mint
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0/0.2.4
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libparserutils-0.2.4-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=61b980734793c5ad379693e4f90156ec
+_md5_=f012fc02823b3f8438f802c4e8d81c61
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.4.2 b/metadata/md5-cache/dev-libs/libpipeline-1.4.2
index b399bac1e256..68e97980f8b6 100644
--- a/metadata/md5-cache/dev-libs/libpipeline-1.4.2
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.4.2
@@ -6,7 +6,8 @@ HOMEPAGE=http://libpipeline.nongnu.org/
 IUSE=static-libs test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.4.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6e89e06ddd15a7f43eb3fce0b4c85af8
+_md5_=817f0ff03355d92cf23592ec401f8324
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.5.0 b/metadata/md5-cache/dev-libs/libpipeline-1.5.0
index f02c47300ef0..9361723b4cab 100644
--- a/metadata/md5-cache/dev-libs/libpipeline-1.5.0
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.5.0
@@ -6,7 +6,8 @@ HOMEPAGE=http://libpipeline.nongnu.org/
 IUSE=static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.5.0.tar.gz
 _eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=40a3eb0e2cbed940f04e6ffd570d8613
+_md5_=f81702b4429e200a15579675670315c8
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.5.1 b/metadata/md5-cache/dev-libs/libpipeline-1.5.1
index 99d3217df8b6..2d8679cc36e0 100644
--- a/metadata/md5-cache/dev-libs/libpipeline-1.5.1
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.5.1
@@ -6,6 +6,7 @@ HOMEPAGE=http://libpipeline.nongnu.org/
 IUSE=static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.5.1.tar.gz
-_md5_=0f39ce59f6be083cd4e1fb655a42bb32
+_md5_=cbd385418d7934f33665ca02ecea2b06
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.3.1 b/metadata/md5-cache/dev-libs/libqtxdg-3.3.1
index b51346fbdc42..0dbdc69f9856 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.3.1
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.3.1
@@ -8,7 +8,8 @@ IUSE=test test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/libqtxdg/3.3.1/libqtxdg-3.3.1.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d8db7296e46f8a32fe3e3af2e99e259
+_md5_=4b8e62320fdb48f87ce962f29d5dbd5d
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.9 b/metadata/md5-cache/dev-libs/libratbag-0.9
index 949119bac2b7..2ac4c4d5af81 100644
--- a/metadata/md5-cache/dev-libs/libratbag-0.9
+++ b/metadata/md5-cache/dev-libs/libratbag-0.9
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/libevdev virtual/libudev
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.9.tar.gz -> libratbag-0.9.tar.gz
 _eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=44850f6152995a59cceb90d025aaa2c5
+_md5_=7a74f4d80f94d6fa4dde189f47089346
diff --git a/metadata/md5-cache/dev-libs/libressl-2.6.5 b/metadata/md5-cache/dev-libs/libressl-2.6.5
index 40b09059e6fa..9a994c885d54 100644
--- a/metadata/md5-cache/dev-libs/libressl-2.6.5
+++ b/metadata/md5-cache/dev-libs/libressl-2.6.5
@@ -9,7 +9,8 @@ LICENSE=ISC openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=!dev-libs/openssl:0
 REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
 SLOT=0/44
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9b1cc9032764c65cf63ec28c2eee280e
+_md5_=ad3886d8f55bc2b40cb333d358556643
diff --git a/metadata/md5-cache/dev-libs/libressl-2.8.3 b/metadata/md5-cache/dev-libs/libressl-2.8.3
index d0cc46f81a16..898ef86ff41a 100644
--- a/metadata/md5-cache/dev-libs/libressl-2.8.3
+++ b/metadata/md5-cache/dev-libs/libressl-2.8.3
@@ -9,7 +9,8 @@ LICENSE=ISC openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=!dev-libs/openssl:0
 REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
 SLOT=0/46
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8e90f901b937a25c0a4bb05d96abd836
+_md5_=88d0499ed3a0c1983b7f642fa2a0c1e7
diff --git a/metadata/md5-cache/dev-libs/libressl-2.9.1 b/metadata/md5-cache/dev-libs/libressl-2.9.1
index b26a95cfadc0..ac74dff08efb 100644
--- a/metadata/md5-cache/dev-libs/libressl-2.9.1
+++ b/metadata/md5-cache/dev-libs/libressl-2.9.1
@@ -9,7 +9,8 @@ LICENSE=ISC openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=!dev-libs/openssl:0
 REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
 SLOT=0/47
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.1.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=76dd005d9979acacdeb86aee5881dce3
+_md5_=cb256158ec23ca27694782f564e56d59
diff --git a/metadata/md5-cache/dev-libs/libressl-2.9.2 b/metadata/md5-cache/dev-libs/libressl-2.9.2
index ea50293abdd0..4bd21d7c6589 100644
--- a/metadata/md5-cache/dev-libs/libressl-2.9.2
+++ b/metadata/md5-cache/dev-libs/libressl-2.9.2
@@ -9,7 +9,8 @@ LICENSE=ISC openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=!dev-libs/openssl:0
 REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
 SLOT=0/47
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.2.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4822fe47a34a424cbab63201dc766f6a
+_md5_=fdd07f3be72172cf5cb7aa7c5e3bb527
diff --git a/metadata/md5-cache/dev-libs/libressl-3.0.0 b/metadata/md5-cache/dev-libs/libressl-3.0.0
index 315a2d0c38d3..b063b31fb5e2 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.0.0
+++ b/metadata/md5-cache/dev-libs/libressl-3.0.0
@@ -10,7 +10,8 @@ LICENSE=ISC openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=!dev-libs/openssl:0
 REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
 SLOT=0/47
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.0.0.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a6b2fd3fc5a6a5c40b9b481e7fc8757d
+_md5_=f51de45946ad131ed66a7547d4a51a16
diff --git a/metadata/md5-cache/dev-libs/libressl-3.0.1 b/metadata/md5-cache/dev-libs/libressl-3.0.1
index e8c333284487..828102b62b95 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.0.1
+++ b/metadata/md5-cache/dev-libs/libressl-3.0.1
@@ -10,7 +10,8 @@ LICENSE=ISC openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=!dev-libs/openssl:0
 REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
 SLOT=0/47
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.0.1.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a6b2fd3fc5a6a5c40b9b481e7fc8757d
+_md5_=f51de45946ad131ed66a7547d4a51a16
diff --git a/metadata/md5-cache/dev-libs/libressl-3.0.2 b/metadata/md5-cache/dev-libs/libressl-3.0.2
index 774889fa23d3..3a6f0bae8e72 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.0.2
+++ b/metadata/md5-cache/dev-libs/libressl-3.0.2
@@ -10,7 +10,8 @@ LICENSE=ISC openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=!dev-libs/openssl:0
 REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
 SLOT=0/47
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.0.2.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a6b2fd3fc5a6a5c40b9b481e7fc8757d
+_md5_=f51de45946ad131ed66a7547d4a51a16
diff --git a/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1 b/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
index 1f2ed926005c..1c29ce0b6173 100644
--- a/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
+++ b/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
@@ -7,7 +7,8 @@ IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mi
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sf.net/projects/libwpd/files/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f356c27cc76437339e9d25f00837515e
+_md5_=5d75c233d09fc867168f031a655f4c9d
diff --git a/metadata/md5-cache/dev-libs/librevenge-9999 b/metadata/md5-cache/dev-libs/librevenge-9999
index cefa04e933ad..817c0cbf33db 100644
--- a/metadata/md5-cache/dev-libs/librevenge-9999
+++ b/metadata/md5-cache/dev-libs/librevenge-9999
@@ -8,6 +8,7 @@ IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mi
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 PROPERTIES=live
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6d8dfa6683716288c7dcc64cb8f4108c
+_md5_=8233c860c760d05c041c29dd01bb1b28
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.10.1 b/metadata/md5-cache/dev-libs/libsigc++-2.10.1
index 872a6143ebd7..ee51bc8f7cfa 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.10.1
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.10.1
@@ -6,7 +6,8 @@ HOMEPAGE=http://libsigc.sourceforge.net/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.10/libsigc++-2.10.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5b389054b0fac77283d22d1ef2b0fa8
+_md5_=ad0fbef8af78ba3c613b984fc8809f7b
diff --git a/metadata/md5-cache/dev-libs/libstrl-0.5.1-r1 b/metadata/md5-cache/dev-libs/libstrl-0.5.1-r1
index 9a64414cc2f8..5264ccc41b95 100644
--- a/metadata/md5-cache/dev-libs/libstrl-0.5.1-r1
+++ b/metadata/md5-cache/dev-libs/libstrl-0.5.1-r1
@@ -6,7 +6,8 @@ HOMEPAGE=http://ohnopub.net/~ohnobinki/libstrl/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 x86 ~amd64-linux ~x64-macos
 LICENSE=LGPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mirror.ohnopub.net/mirror/libstrl-0.5.1.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=121b1508983b3539ad588ff148723613
+_md5_=c1c362bcaed321d443a834723be948c1
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.19-r1 b/metadata/md5-cache/dev-libs/libusb-1.0.19-r1
index 8735ad9b4b1f..ccaa5b3287b2 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.19-r1
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.19-r1
@@ -7,7 +7,8 @@ IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 abi_x86_x32
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] )
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://sourceforge/libusb/libusb-1.0.19.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=7f3786edb1745e28ae521fce9ebabb77
+_md5_=db54ad75103a93ae7f7c102946a82b42
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.21-r1 b/metadata/md5-cache/dev-libs/libusb-1.0.21-r1
index caf7164aa74a..ce800e44a00a 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.21-r1
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.21-r1
@@ -7,7 +7,8 @@ IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 abi_x86_x32
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] )
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.21/libusb-1.0.21.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=e6ff8d4580c3f69a3ce10836212e00cb
+_md5_=723b8795c52580d406a866462e3674b6
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.22 b/metadata/md5-cache/dev-libs/libusb-1.0.22
index db2d4699f8b0..b741b8e2b515 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.22
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.22
@@ -7,7 +7,8 @@ IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 abi_x86_x32
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] )
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.tar.bz2
 _eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=0cb934c295e2d4f86b2fe519c82a805f
+_md5_=c0d0812b53286980d30765cfdfe72f03
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.23-r1 b/metadata/md5-cache/dev-libs/libusb-1.0.23-r1
index 98824283930e..1e39cef28d6b 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.23-r1
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.23-r1
@@ -7,7 +7,8 @@ IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 abi_x86_x32
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] )
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=54ba6e98d0b7132fa870225af6bf1716
+_md5_=6bcde41b36de82e61e422333acc01fcf
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.4.0 b/metadata/md5-cache/dev-libs/libutf8proc-2.4.0
index f686b464e9d7..73675a18845c 100644
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.4.0
+++ b/metadata/md5-cache/dev-libs/libutf8proc-2.4.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/JuliaStrings/utf8proc
 IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0/2.4.0
 SRC_URI=https://github.com/JuliaStrings/utf8proc/archive/v2.4.0.tar.gz -> libutf8proc-2.4.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6a741cf38ce2bfaf44f65d0dadc5f188
+_md5_=504029fa11ff890c1c738961d5d956a3
diff --git a/metadata/md5-cache/dev-libs/libwapcaplet-0.4.1-r1 b/metadata/md5-cache/dev-libs/libwapcaplet-0.4.1-r1
index 654432de687a..09f20b2e0fb4 100644
--- a/metadata/md5-cache/dev-libs/libwapcaplet-0.4.1-r1
+++ b/metadata/md5-cache/dev-libs/libwapcaplet-0.4.1-r1
@@ -6,7 +6,8 @@ HOMEPAGE=http://www.netsurf-browser.org/projects/libwapcaplet/
 IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~m68k-mint
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0/0.4.1
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libwapcaplet-0.4.1-src.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=225f3da5740e001bd9aa6fea2bca1f3d
+_md5_=d85b781ab56c768682b2ebaeef7a734b
diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.11.2 b/metadata/md5-cache/dev-libs/libwbxml-0.11.2
index 1226bcfe8562..a5e42875036a 100644
--- a/metadata/md5-cache/dev-libs/libwbxml-0.11.2
+++ b/metadata/md5-cache/dev-libs/libwbxml-0.11.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat virtual/libiconv
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/libwbxml/libwbxml-0.11.2.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82efac847f966a541d48f61b690405fc
+_md5_=ebb7a4cd20472a1e18225c4197e4d9bd
diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.11.6 b/metadata/md5-cache/dev-libs/libwbxml-0.11.6
index 085bfbf39b64..9c99e5dd990a 100644
--- a/metadata/md5-cache/dev-libs/libwbxml-0.11.6
+++ b/metadata/md5-cache/dev-libs/libwbxml-0.11.6
@@ -8,7 +8,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat virtual/libiconv
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/libwbxml/libwbxml-0.11.6.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57b98ec3dccd9bde5bb14005231c700e
+_md5_=beacdd5c1a7e42d81dc62197093df738
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.2.2 b/metadata/md5-cache/dev-libs/libyaml-0.2.2
index e62ca41fc84e..534cd08ab791 100644
--- a/metadata/md5-cache/dev-libs/libyaml-0.2.2
+++ b/metadata/md5-cache/dev-libs/libyaml-0.2.2
@@ -7,7 +7,8 @@ HOMEPAGE=https://github.com/yaml/libyaml
 IUSE=doc static-libs test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaml/libyaml/archive/0.2.2.tar.gz -> libyaml-0.2.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5001a27d2883270a79def96fea96d28d
+_md5_=6001a07f7aaeab13322405ca9a8e6f61
diff --git a/metadata/md5-cache/dev-libs/libzip-1.5.1 b/metadata/md5-cache/dev-libs/libzip-1.5.1
index 62f7044cb35e..15987c274bc0 100644
--- a/metadata/md5-cache/dev-libs/libzip-1.5.1
+++ b/metadata/md5-cache/dev-libs/libzip-1.5.1
@@ -8,7 +8,8 @@ IUSE=bzip2 doc gnutls libressl ssl static-libs test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://www.nih.at/libzip/libzip-1.5.1.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b3e093e7143ccd08a99c7a5734c96779
+_md5_=ee3b76f450fdf6b312e77fccdc1edc27
diff --git a/metadata/md5-cache/dev-libs/libzip-1.5.2-r2 b/metadata/md5-cache/dev-libs/libzip-1.5.2-r2
index 39205751e699..d4094136243a 100644
--- a/metadata/md5-cache/dev-libs/libzip-1.5.2-r2
+++ b/metadata/md5-cache/dev-libs/libzip-1.5.2-r2
@@ -8,7 +8,8 @@ IUSE=bzip2 doc gnutls libressl mbedtls ssl static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) )
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://www.nih.at/libzip/libzip-1.5.2.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ab642abcc78d81853c06b157490a5b1
+_md5_=a3167d26ac604453bbb0c374600452fe
diff --git a/metadata/md5-cache/dev-libs/log4cpp-1.1 b/metadata/md5-cache/dev-libs/log4cpp-1.1
index 46efbfeccf2e..9d54427652a0 100644
--- a/metadata/md5-cache/dev-libs/log4cpp-1.1
+++ b/metadata/md5-cache/dev-libs/log4cpp-1.1
@@ -6,7 +6,8 @@ HOMEPAGE=http://log4cpp.sourceforge.net/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ppc s390 x86
 LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=mirror://sourceforge/log4cpp/log4cpp-1.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=90926059097b1cbb74bc050d04800006
+_md5_=e01b668c3474a7116924f76a05779d68
diff --git a/metadata/md5-cache/dev-libs/log4cpp-1.1.3 b/metadata/md5-cache/dev-libs/log4cpp-1.1.3
index 06d5501afb1f..f8be19c2af0c 100644
--- a/metadata/md5-cache/dev-libs/log4cpp-1.1.3
+++ b/metadata/md5-cache/dev-libs/log4cpp-1.1.3
@@ -6,7 +6,8 @@ HOMEPAGE=http://log4cpp.sourceforge.net/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~ppc ~s390 ~x86
 LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=mirror://sourceforge/log4cpp/log4cpp-1.1.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=093b63d4935c7e53a5c13476c26950f5
+_md5_=983b8d2147efbda97266eac655b83936
diff --git a/metadata/md5-cache/dev-libs/msgpack-1.1.0 b/metadata/md5-cache/dev-libs/msgpack-1.1.0
index cb232c9b2488..cd202ad81a2e 100644
--- a/metadata/md5-cache/dev-libs/msgpack-1.1.0
+++ b/metadata/md5-cache/dev-libs/msgpack-1.1.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
 IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-1.1.0/msgpack-1.1.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc030624332e1a3b61367e2e39524070
+_md5_=a27bb28f52b874405a7e3f8f0c34b2b4
diff --git a/metadata/md5-cache/dev-libs/msgpack-3.1.1 b/metadata/md5-cache/dev-libs/msgpack-3.1.1
index a452f697b656..09bba473d4ea 100644
--- a/metadata/md5-cache/dev-libs/msgpack-3.1.1
+++ b/metadata/md5-cache/dev-libs/msgpack-3.1.1
@@ -8,7 +8,8 @@ IUSE=boost +cxx doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-3.1.1/msgpack-3.1.1.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=780c040ff8a89c215d80cd004e3ddcbe
+_md5_=998bb6d50822152c5c0a94df701657f6
diff --git a/metadata/md5-cache/dev-libs/msgpack-3.2.0 b/metadata/md5-cache/dev-libs/msgpack-3.2.0
index a3c43707e291..2c3bdc995c3d 100644
--- a/metadata/md5-cache/dev-libs/msgpack-3.2.0
+++ b/metadata/md5-cache/dev-libs/msgpack-3.2.0
@@ -8,7 +8,8 @@ IUSE=boost +cxx doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-3.2.0/msgpack-3.2.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fff3aac8b7d98f0d24600d4d70671f86
+_md5_=998bb6d50822152c5c0a94df701657f6
diff --git a/metadata/md5-cache/dev-libs/nettle-3.4.1 b/metadata/md5-cache/dev-libs/nettle-3.4.1
index 6024b7516f28..ea6ccd24d843 100644
--- a/metadata/md5-cache/dev-libs/nettle-3.4.1
+++ b/metadata/md5-cache/dev-libs/nettle-3.4.1
@@ -8,7 +8,8 @@ IUSE=doc +gmp neon static-libs test cpu_flags_x86_aes abi_x86_32 abi_x86_64 abi_
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/6.2
 SRC_URI=mirror://gnu/nettle/nettle-3.4.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b46f37b7f39b886636aac019b2532dfc
+_md5_=c52c8fefb95201df5097f349aec31d13
diff --git a/metadata/md5-cache/dev-libs/nettle-3.5.1 b/metadata/md5-cache/dev-libs/nettle-3.5.1
index db391dbbd575..808766299e81 100644
--- a/metadata/md5-cache/dev-libs/nettle-3.5.1
+++ b/metadata/md5-cache/dev-libs/nettle-3.5.1
@@ -8,7 +8,8 @@ IUSE=doc +gmp neon static-libs test cpu_flags_x86_aes cpu_flags_x86_sha abi_x86_
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=mirror://gnu/nettle/nettle-3.5.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e29cecd0c2a3ab066a9db474d4abde4f
+_md5_=7f5989263ed1e2f96d71d56e61b3781b
diff --git a/metadata/md5-cache/dev-libs/nsync-1.20.1 b/metadata/md5-cache/dev-libs/nsync-1.20.1
index 75de055661f6..cf9718ea3fcd 100644
--- a/metadata/md5-cache/dev-libs/nsync-1.20.1
+++ b/metadata/md5-cache/dev-libs/nsync-1.20.1
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/google/nsync
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/nsync/archive/1.20.1.tar.gz -> nsync-1.20.1.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce2884c93c69242880e110dde63a8878
+_md5_=596dd3f786dafe87da37d38b12d797f9
diff --git a/metadata/md5-cache/dev-libs/ntl-10.5.0 b/metadata/md5-cache/dev-libs/ntl-10.5.0
index b18adfc1d139..507fa9b3f6d1 100644
--- a/metadata/md5-cache/dev-libs/ntl-10.5.0
+++ b/metadata/md5-cache/dev-libs/ntl-10.5.0
@@ -7,7 +7,8 @@ IUSE=doc static-libs test threads bindist
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= >=dev-libs/gf2x-0.9
+RESTRICT=!test? ( test )
 SLOT=0/35
 SRC_URI=http://www.shoup.net/ntl/ntl-10.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c7a099a934122fb970f66dc39f1805a9
+_md5_=9633daed605622a839d5e4fd128eb353
diff --git a/metadata/md5-cache/dev-libs/ntl-9.3.0 b/metadata/md5-cache/dev-libs/ntl-9.3.0
index 3bea160f46dc..b09c614bb853 100644
--- a/metadata/md5-cache/dev-libs/ntl-9.3.0
+++ b/metadata/md5-cache/dev-libs/ntl-9.3.0
@@ -7,7 +7,8 @@ IUSE=doc static-libs test
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:= >=dev-libs/gf2x-0.9
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.shoup.net/ntl/ntl-9.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf41a25629eb6a186fe90cbbc7c409b9
+_md5_=2b5b18eed51ff2f46202fdb58930ecd8
diff --git a/metadata/md5-cache/dev-libs/ntl-9.6.4 b/metadata/md5-cache/dev-libs/ntl-9.6.4
index 661759ec5b1d..99135837672d 100644
--- a/metadata/md5-cache/dev-libs/ntl-9.6.4
+++ b/metadata/md5-cache/dev-libs/ntl-9.6.4
@@ -7,7 +7,8 @@ IUSE=doc static-libs test
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= >=dev-libs/gf2x-0.9
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.shoup.net/ntl/ntl-9.6.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc42d30406cf3160341ec6ada53698a6
+_md5_=7ca57f7f3b36b442391aae99b5505ff6
diff --git a/metadata/md5-cache/dev-libs/opensc-0.19.0-r2 b/metadata/md5-cache/dev-libs/opensc-0.19.0-r2
index f1912fd6f67f..d5e2695f58b8 100644
--- a/metadata/md5-cache/dev-libs/opensc-0.19.0-r2
+++ b/metadata/md5-cache/dev-libs/opensc-0.19.0-r2
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2= )
 REQUIRED_USE=pcsc-lite? ( !openct !ctapi ) openct? ( !pcsc-lite !ctapi ) ctapi? ( !pcsc-lite !openct ) || ( pcsc-lite openct ctapi )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenSC/OpenSC/releases/download/0.19.0/opensc-0.19.0.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f3e6c9454543418d4ea356be73904b58
+_md5_=90df268c8a6204497fc8c2140b59117f
diff --git a/metadata/md5-cache/dev-libs/pegtl-1.3.1-r1 b/metadata/md5-cache/dev-libs/pegtl-1.3.1-r1
index 7b0b2c25820a..8fc88756aad2 100644
--- a/metadata/md5-cache/dev-libs/pegtl-1.3.1-r1
+++ b/metadata/md5-cache/dev-libs/pegtl-1.3.1-r1
@@ -5,7 +5,8 @@ HOMEPAGE=https://github.com/ColinH/PEGTL
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ColinH/PEGTL/archive/1.3.1.tar.gz -> pegtl-1.3.1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=361fe38de5c696acf579dff4116d9ccf
+_md5_=3e389b370d0197f830d16919e0c18d03
diff --git a/metadata/md5-cache/dev-libs/pegtl-2.0.0 b/metadata/md5-cache/dev-libs/pegtl-2.0.0
index 2ebc2a30ab14..7d5400a02029 100644
--- a/metadata/md5-cache/dev-libs/pegtl-2.0.0
+++ b/metadata/md5-cache/dev-libs/pegtl-2.0.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/taocpp/PEGTL
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/2.0.0.tar.gz -> pegtl-2.0.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a0a542dab2e864b29bfcd83ee45e480
+_md5_=5f9a976ff157d0e9568625a906b5fea0
diff --git a/metadata/md5-cache/dev-libs/pegtl-2.0_pre1 b/metadata/md5-cache/dev-libs/pegtl-2.0_pre1
index 43f3c17adc30..fac87cdfe9c2 100644
--- a/metadata/md5-cache/dev-libs/pegtl-2.0_pre1
+++ b/metadata/md5-cache/dev-libs/pegtl-2.0_pre1
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/taocpp/PEGTL
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/bce83a6c7928c4cc8f9a5e18efbca40d18394d32.tar.gz -> pegtl-2.0_pre1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7859f0f2554cfc337aa656084249357
+_md5_=bfa0ebd3c180110df502fd4030e06e2c
diff --git a/metadata/md5-cache/dev-libs/pegtl-2.1.4 b/metadata/md5-cache/dev-libs/pegtl-2.1.4
index 1b1be7a8a9fa..83ecf9881590 100644
--- a/metadata/md5-cache/dev-libs/pegtl-2.1.4
+++ b/metadata/md5-cache/dev-libs/pegtl-2.1.4
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/taocpp/PEGTL
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/2.1.4.tar.gz -> pegtl-2.1.4.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a0a542dab2e864b29bfcd83ee45e480
+_md5_=5f9a976ff157d0e9568625a906b5fea0
diff --git a/metadata/md5-cache/dev-libs/poco-1.9.0-r2 b/metadata/md5-cache/dev-libs/poco-1.9.0-r2
index 3ffd35ca1bd5..4271337187e1 100644
--- a/metadata/md5-cache/dev-libs/poco-1.9.0-r2
+++ b/metadata/md5-cache/dev-libs/poco-1.9.0-r2
@@ -9,7 +9,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=Boost-1.0
 RDEPEND=>=dev-libs/libpcre-8.42 mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xml? ( dev-libs/expat ) zip? ( sys-libs/zlib )
 REQUIRED_USE=7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mongodb? ( data ) mysql? ( data ) odbc? ( data ) pagecompiler? ( json net util xml ) pocodoc? ( cppparser util xml ) sqlite? ( data ) ssl? ( util ) test? ( data? ( sqlite ) json util xml )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.9.0-release.tar.gz -> poco-1.9.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f473ea443c6b11095358f574b8a7724a
+_md5_=4e67ff2202c7bd5d1fbdccfbce97ced9
diff --git a/metadata/md5-cache/dev-libs/processor-trace-1.6.1 b/metadata/md5-cache/dev-libs/processor-trace-1.6.1
index d8edb66057fb..89e7c14b5eaf 100644
--- a/metadata/md5-cache/dev-libs/processor-trace-1.6.1
+++ b/metadata/md5-cache/dev-libs/processor-trace-1.6.1
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/01org/processor-trace
 IUSE=doc test
 KEYWORDS=-* ~amd64
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/01org/processor-trace/archive/v1.6.1.tar.gz -> processor-trace-1.6.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=64471ac5e575b8876771899434ad5456
+_md5_=436888a73d7895d7f6ec2821e6804eff
diff --git a/metadata/md5-cache/dev-libs/processor-trace-1.6.2 b/metadata/md5-cache/dev-libs/processor-trace-1.6.2
index 8ec737c8367f..b162cbaf7031 100644
--- a/metadata/md5-cache/dev-libs/processor-trace-1.6.2
+++ b/metadata/md5-cache/dev-libs/processor-trace-1.6.2
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/01org/processor-trace
 IUSE=doc test
 KEYWORDS=-* ~amd64
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/01org/processor-trace/archive/v1.6.2.tar.gz -> processor-trace-1.6.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29b767ecf4fecb0ae5f67a18eb360102
+_md5_=436888a73d7895d7f6ec2821e6804eff
diff --git a/metadata/md5-cache/dev-libs/processor-trace-2.0 b/metadata/md5-cache/dev-libs/processor-trace-2.0
index a1155e948f66..7c5014ef2825 100644
--- a/metadata/md5-cache/dev-libs/processor-trace-2.0
+++ b/metadata/md5-cache/dev-libs/processor-trace-2.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/01org/processor-trace
 IUSE=doc test
 KEYWORDS=-* ~amd64
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/01org/processor-trace/archive/v2.0.tar.gz -> processor-trace-2.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b051bb7d5010a5408200dade7a411b5
+_md5_=7eafac36a3c4ad4dc2e53a2b2fb7b307
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.1 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.1
index 0e82dc631193..80eb65e32624 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.1
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.3.1
@@ -8,7 +8,8 @@ IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n6
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/protobuf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.1/protobuf-c-1.3.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ff79e7f7e9e5e0c3a30a3f7599947b07
+_md5_=d0bda089f6bca1d3334cc57a2b0cb4d9
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.2 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.2
index 75bd13afa8a8..70bb823d0f44 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.2
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.3.2
@@ -8,7 +8,8 @@ IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/protobuf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.2/protobuf-c-1.3.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f63130c0ea395ae6f6e24b2d5a33fe59
+_md5_=bf872c7cb0df907efef0ab9ec8a3dfc2
diff --git a/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3 b/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3
index b895f14234f2..9e5814e47fa3 100644
--- a/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3
+++ b/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3
@@ -7,7 +7,8 @@ IUSE=debug doc test
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-crypt/qca:2[debug?,qt5(+)] dev-qt/qtnetwork:5 app-crypt/qca:2[ssl] !dev-libs/qoauth:0
+RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/qoauth-2.0.1_pre20160315.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=33d70d16ccb0e6e83873216d6e2fd75b
+_md5_=2a2440ee3d61296c4da76abd0ddd211f
diff --git a/metadata/md5-cache/dev-libs/rapidjson-1.1.0 b/metadata/md5-cache/dev-libs/rapidjson-1.1.0
index 2f9f3415df9e..c26d6cfbf981 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-1.1.0
+++ b/metadata/md5-cache/dev-libs/rapidjson-1.1.0
@@ -6,7 +6,8 @@ HOMEPAGE=http://rapidjson.org/
 IUSE=doc examples test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz -> rapidjson-1.1.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cbee6d9d80313ef9d341a8b4f481b067
+_md5_=686d750011b88ab42f584d21dfa8b7e5
diff --git a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r1 b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r1
index 8dab48496fe3..2293758f5106 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r1
+++ b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r1
@@ -6,7 +6,8 @@ HOMEPAGE=http://rapidjson.org/
 IUSE=doc examples test
 KEYWORDS=amd64 x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz -> rapidjson-1.1.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff919d8c9dbc930203615ff273ccf2d1
+_md5_=8d75759d141bf76d5d2834634c9a8268
diff --git a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2 b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2
index a211d212a67d..6b2b72ea5faa 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2
+++ b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2
@@ -7,7 +7,8 @@ HOMEPAGE=https://rapidjson.org/
 IUSE=doc examples test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz -> rapidjson-1.1.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48cc2381f19452e3d68d6e5eb1fd8994
+_md5_=33942bd85707b18523e9ba4246bc3191
diff --git a/metadata/md5-cache/dev-libs/rapidjson-9999 b/metadata/md5-cache/dev-libs/rapidjson-9999
index 7cacf813d05a..add046f463ca 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-9999
+++ b/metadata/md5-cache/dev-libs/rapidjson-9999
@@ -7,6 +7,7 @@ HOMEPAGE=https://rapidjson.org/
 IUSE=doc examples test
 LICENSE=MIT
 PROPERTIES=live
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c014face6457a27bb6003d355b40759c
+_md5_=20e01cf07b99bc5d5dc5079df3d58207
diff --git a/metadata/md5-cache/dev-libs/rasqal-0.9.33 b/metadata/md5-cache/dev-libs/rasqal-0.9.33
index 5335f7114637..e502a55ba7d4 100644
--- a/metadata/md5-cache/dev-libs/rasqal-0.9.33
+++ b/metadata/md5-cache/dev-libs/rasqal-0.9.33
@@ -8,7 +8,8 @@ IUSE=+crypt gmp kernel_linux +mhash pcre static-libs test xml
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/raptor-2.0.15 crypt? ( !mhash? ( dev-libs/libgcrypt:0 ) mhash? ( app-crypt/mhash ) ) !gmp? ( dev-libs/mpfr:= ) gmp? ( dev-libs/gmp:= ) kernel_linux? ( >=sys-apps/util-linux-2.19 ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/rasqal-0.9.33.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5cc043c9f15b0317be0ee2cf70538fd2
+_md5_=860f2da099503fbe3ec5fb8b841e589d
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.6.0 b/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.6.0
index 31051b51f225..7fd894b12af4 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.6.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.6.0
@@ -8,7 +8,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=sys-devel/llvm-roc:= dev-libs/rocr-runtime
+RESTRICT=!test? ( test )
 SLOT=0/2.6
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-2.6.0.tar.gz -> rocm-opencl-driver-2.6.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d93ca56f0444c84f4b64e826f2737eb8
+_md5_=4a15b3ec53dfec1a9eadd0c13fa3fa09
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.7.0 b/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.7.0
index 6cee012feaa5..57a3d61439a8 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.7.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.7.0
@@ -8,7 +8,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-2.7.0:= >=dev-libs/rocr-runtime-2.7.0
+RESTRICT=!test? ( test )
 SLOT=0/2.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-2.7.0.tar.gz -> rocm-opencl-driver-2.7.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc7303c36cb2736ad92faecb1fc58585
+_md5_=f4bda5828f5a8d38d3c2e06db71e93ac
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.8.0 b/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.8.0
index 633cccffa65d..d0b3e16ce10d 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.8.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.8.0
@@ -8,7 +8,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-2.8.0:= >=dev-libs/rocr-runtime-2.8.0
+RESTRICT=!test? ( test )
 SLOT=0/2.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-2.8.0.tar.gz -> rocm-opencl-driver-2.8.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=52e080ee5aa7c0cb3969a359c75f9a4e
+_md5_=48bc0a8a231b300c86780d8d467c2615
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.9.0 b/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.9.0
index c311d4ca0fab..2181046b3d75 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.9.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.9.0
@@ -8,7 +8,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-2.9.0:= >=dev-libs/rocr-runtime-2.9.0
+RESTRICT=!test? ( test )
 SLOT=0/2.9
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-2.9.0.tar.gz -> rocm-opencl-driver-2.9.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=52e080ee5aa7c0cb3969a359c75f9a4e
+_md5_=48bc0a8a231b300c86780d8d467c2615
diff --git a/metadata/md5-cache/dev-libs/serd-0.28.0-r1 b/metadata/md5-cache/dev-libs/serd-0.28.0-r1
index a3c6c48a2411..ed6ec2f1db6e 100644
--- a/metadata/md5-cache/dev-libs/serd-0.28.0-r1
+++ b/metadata/md5-cache/dev-libs/serd-0.28.0-r1
@@ -6,7 +6,8 @@ HOMEPAGE=http://drobilla.net/software/serd/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=ISC
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/serd-0.28.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=6ae6aab2dae7d819e9fd2cbb307d510e
+_md5_=3c81f69ce15d4fca4c7cff57335a7390
diff --git a/metadata/md5-cache/dev-libs/softhsm-2.5.0 b/metadata/md5-cache/dev-libs/softhsm-2.5.0
index 54f74682caeb..eda6c67d8f12 100644
--- a/metadata/md5-cache/dev-libs/softhsm-2.5.0
+++ b/metadata/md5-cache/dev-libs/softhsm-2.5.0
@@ -8,6 +8,7 @@ IUSE=bindist gost libressl migration-tool test
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:= ) !~dev-libs/softhsm-2.0.0:0
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://www.opendnssec.org/files/source/softhsm-2.5.0.tar.gz
-_md5_=f857a2cc6cfe6eaf48803ef710b96173
+_md5_=f986d8ddb749df87ed1b49ca4225d45d
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.0-r1 b/metadata/md5-cache/dev-libs/sord-0.16.0-r1
index d485e78f2a21..cf73b121c803 100644
--- a/metadata/md5-cache/dev-libs/sord-0.16.0-r1
+++ b/metadata/md5-cache/dev-libs/sord-0.16.0-r1
@@ -7,7 +7,8 @@ IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mip
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=ISC
 RDEPEND=>=dev-libs/serd-0.28.0-r1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sord-0.16.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=5a1b6594da2ac9ecddef172944b5259b
+_md5_=f298df5e7e4182f5807335600940536f
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.2.1 b/metadata/md5-cache/dev-libs/spdlog-1.2.1
index f8f567412fed..206224a7b6a9 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.2.1
+++ b/metadata/md5-cache/dev-libs/spdlog-1.2.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-libs/libfmt:0/5
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.2.1.tar.gz -> spdlog-1.2.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20eb47ca29b26c71eb579215120f368c
+_md5_=f4479d41aaa3e776bcdf6dde0a00c568
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.3.0 b/metadata/md5-cache/dev-libs/spdlog-1.3.0
index 6b8f26f7b3be..66b76eb4f1f4 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.3.0
+++ b/metadata/md5-cache/dev-libs/spdlog-1.3.0
@@ -8,7 +8,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/libfmt-5.0.0
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.3.0.tar.gz -> spdlog-1.3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a6bb52be2bd0c1f013a81d56a5444be1
+_md5_=255f717428345d47569c1f435fb534b1
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.3.1 b/metadata/md5-cache/dev-libs/spdlog-1.3.1
index 9a2a78495d84..831b39725357 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.3.1
+++ b/metadata/md5-cache/dev-libs/spdlog-1.3.1
@@ -8,7 +8,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-libs/libfmt:0/5
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.3.1.tar.gz -> spdlog-1.3.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5f040285d9f2a5c741305a622d944b51
+_md5_=2d8d512653729335ca45eece29270ccb
diff --git a/metadata/md5-cache/dev-libs/spdlog-9999 b/metadata/md5-cache/dev-libs/spdlog-9999
index 65eafc9feb6b..f31ac06e87b6 100644
--- a/metadata/md5-cache/dev-libs/spdlog-9999
+++ b/metadata/md5-cache/dev-libs/spdlog-9999
@@ -8,6 +8,7 @@ IUSE=test
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/libfmt-5.0.0
+RESTRICT=!test? ( test )
 SLOT=0/1
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d855f62c0255c35f15caeaf258b0fab0
+_md5_=7addcf66494ebccd152cbe76492a92ef
diff --git a/metadata/md5-cache/dev-libs/squareball-0.2.0 b/metadata/md5-cache/dev-libs/squareball-0.2.0
index 21cfe7f98d09..e764ec58bff3 100644
--- a/metadata/md5-cache/dev-libs/squareball-0.2.0
+++ b/metadata/md5-cache/dev-libs/squareball-0.2.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/rafaelmartins/squareball
 IUSE=doc test static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rafaelmartins/squareball/releases/download/v0.2.0/squareball-0.2.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=46267781d833cebca6eee9cab797507f
+_md5_=a6b221091be3e42e07909750f1cfe9bb
diff --git a/metadata/md5-cache/dev-libs/squareball-9999 b/metadata/md5-cache/dev-libs/squareball-9999
index 6ff8eab57762..1a90fde44654 100644
--- a/metadata/md5-cache/dev-libs/squareball-9999
+++ b/metadata/md5-cache/dev-libs/squareball-9999
@@ -6,6 +6,7 @@ HOMEPAGE=https://github.com/rafaelmartins/squareball
 IUSE=doc test static-libs
 LICENSE=BSD
 PROPERTIES=live
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=46267781d833cebca6eee9cab797507f
+_md5_=a6b221091be3e42e07909750f1cfe9bb
diff --git a/metadata/md5-cache/dev-libs/stp-2.3.3 b/metadata/md5-cache/dev-libs/stp-2.3.3
index 394db7d75e03..3ee439da1925 100644
--- a/metadata/md5-cache/dev-libs/stp-2.3.3
+++ b/metadata/md5-cache/dev-libs/stp-2.3.3
@@ -8,7 +8,8 @@ IUSE=python static test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ MIT
 RDEPEND=sci-mathematics/minisat
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stp/stp/archive/2.3.3.tar.gz -> stp-2.3.3.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c682936966294e24099d27804865b90a
+_md5_=f152627f57f693c9757418c23c5470ff
diff --git a/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.3 b/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.3
index 77ad596b05e7..cc79d1593684 100644
--- a/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.3
+++ b/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.3
@@ -8,7 +8,8 @@ IUSE=archive crypt gtk-doc +introspection +quvi test
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 quvi? ( >=media-libs/libquvi-0.9.1:0= ) archive? ( >=app-arch/libarchive-3:0= ) dev-libs/libxml2:2 crypt? ( dev-libs/libgcrypt:0= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.3.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88e0945510d47e7107c7c750f7cd81b4
+_md5_=05e4ca07d7db7275d6d4df766e435ef7
diff --git a/metadata/md5-cache/dev-libs/tvmet-1.7.2-r2 b/metadata/md5-cache/dev-libs/tvmet-1.7.2-r2
index 967c46f83e28..5e9098ce38ff 100644
--- a/metadata/md5-cache/dev-libs/tvmet-1.7.2-r2
+++ b/metadata/md5-cache/dev-libs/tvmet-1.7.2-r2
@@ -6,7 +6,8 @@ HOMEPAGE=http://tvmet.sourceforge.net/
 IUSE=debug doc test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/tvmet/tvmet-1.7.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bf09ac52409e03d8b57e56f77b710389
+_md5_=3d981cb91c2e718c2db9dc7f3a192dbe
diff --git a/metadata/md5-cache/dev-libs/udis86-1.7-r2 b/metadata/md5-cache/dev-libs/udis86-1.7-r2
index ebf71abffcbf..f19a95a8083a 100644
--- a/metadata/md5-cache/dev-libs/udis86-1.7-r2
+++ b/metadata/md5-cache/dev-libs/udis86-1.7-r2
@@ -6,7 +6,8 @@ HOMEPAGE=http://udis86.sourceforge.net/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~hppa ppc ~ppc64 ~sparc x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/udis86/udis86-1.7.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9ea40708825c618f40f187d54103ec0e
+_md5_=c7393adb4a9a59796009f2c3b3d6e43f
diff --git a/metadata/md5-cache/dev-libs/udis86-1.7.2 b/metadata/md5-cache/dev-libs/udis86-1.7.2
index 6dc0609fcdec..953bc8b10bf2 100644
--- a/metadata/md5-cache/dev-libs/udis86-1.7.2
+++ b/metadata/md5-cache/dev-libs/udis86-1.7.2
@@ -6,7 +6,8 @@ HOMEPAGE=http://udis86.sourceforge.net/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/udis86/udis86-1.7.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d215ddddf90a8a5c42b41ffc66bc9f9a
+_md5_=05877cc0baf2909ec5bc162d45748548
diff --git a/metadata/md5-cache/dev-libs/unittest++-1.6.1 b/metadata/md5-cache/dev-libs/unittest++-1.6.1
index 8f1ea6ca0953..7cc98d98833f 100644
--- a/metadata/md5-cache/dev-libs/unittest++-1.6.1
+++ b/metadata/md5-cache/dev-libs/unittest++-1.6.1
@@ -6,7 +6,8 @@ HOMEPAGE=https://unittest-cpp.github.io/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unittest-cpp/unittest-cpp/archive/v1.6.1.tar.gz -> unittest++-1.6.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fce0ec9f60afa66da738632eeec0524
+_md5_=ba219e2474718faf7ebe450bb69999fb
diff --git a/metadata/md5-cache/dev-libs/unittest++-2.0.0 b/metadata/md5-cache/dev-libs/unittest++-2.0.0
index acd6a217feb4..ce15d4984d4f 100644
--- a/metadata/md5-cache/dev-libs/unittest++-2.0.0
+++ b/metadata/md5-cache/dev-libs/unittest++-2.0.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://unittest-cpp.github.io/
 IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unittest-cpp/unittest-cpp/archive/v2.0.0.tar.gz -> unittest++-2.0.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=12cc8009a9ad0b014312728efb260b40
+_md5_=e349850516f79e2f750ef8b87a942fff
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.10.1 b/metadata/md5-cache/dev-libs/userspace-rcu-0.10.1
index 7e1ba6eb7790..02d5ef55aeb6 100644
--- a/metadata/md5-cache/dev-libs/userspace-rcu-0.10.1
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.10.1
@@ -6,6 +6,7 @@ HOMEPAGE=https://liburcu.org/
 IUSE=static-libs regression-test test
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://lttng.org/files/urcu/userspace-rcu-0.10.1.tar.bz2
-_md5_=0e8b9612f0c91159f904da41eab39738
+_md5_=308375001f3855f022dd7cd4e2769743
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.10.2 b/metadata/md5-cache/dev-libs/userspace-rcu-0.10.2
index 4c6d2f1862d5..aa6480d951dd 100644
--- a/metadata/md5-cache/dev-libs/userspace-rcu-0.10.2
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.10.2
@@ -6,6 +6,7 @@ HOMEPAGE=https://liburcu.org/
 IUSE=static-libs regression-test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://lttng.org/files/urcu/userspace-rcu-0.10.2.tar.bz2
-_md5_=006493aecdb7a75606faee61104d0e49
+_md5_=d7f0d05c34ea1f121fcbc754d03b71df
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.11.1 b/metadata/md5-cache/dev-libs/userspace-rcu-0.11.1
index 730b32b7019e..e63a6352ed0f 100644
--- a/metadata/md5-cache/dev-libs/userspace-rcu-0.11.1
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.11.1
@@ -6,6 +6,7 @@ HOMEPAGE=https://liburcu.org/
 IUSE=static-libs regression-test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://lttng.org/files/urcu/userspace-rcu-0.11.1.tar.bz2
-_md5_=8d625798b8d97d341893ac298e390c6c
+_md5_=1c5462a415ab30a58dac4bada718882a
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.9.1 b/metadata/md5-cache/dev-libs/userspace-rcu-0.9.1
index 04f9fa2f5858..8c0f518a1144 100644
--- a/metadata/md5-cache/dev-libs/userspace-rcu-0.9.1
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.9.1
@@ -6,7 +6,8 @@ HOMEPAGE=https://liburcu.org/
 IUSE=static-libs regression-test test
 KEYWORDS=~alpha amd64 arm hppa ppc ppc64 x86
 LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://lttng.org/files/urcu/userspace-rcu-0.9.1.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5770518282ecd7a7d90593c521de6a0f
+_md5_=220b13f3c06b3d5e29e51897ba0b081a
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.9.2 b/metadata/md5-cache/dev-libs/userspace-rcu-0.9.2
index 21a09b22fb7c..7af9d55577dc 100644
--- a/metadata/md5-cache/dev-libs/userspace-rcu-0.9.2
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.9.2
@@ -6,7 +6,8 @@ HOMEPAGE=https://liburcu.org/
 IUSE=static-libs regression-test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://lttng.org/files/urcu/userspace-rcu-0.9.2.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6156fdf98f89ddd0b57cda4df1332f23
+_md5_=a38b8f36ec1f5338253337e78d98fc78
diff --git a/metadata/md5-cache/dev-libs/uthash-2.0.2 b/metadata/md5-cache/dev-libs/uthash-2.0.2
index c724b71c6b2d..5c521ee2206a 100644
--- a/metadata/md5-cache/dev-libs/uthash-2.0.2
+++ b/metadata/md5-cache/dev-libs/uthash-2.0.2
@@ -6,7 +6,8 @@ HOMEPAGE=https://troydhanson.github.io/uthash/index.html
 IUSE=test
 KEYWORDS=amd64 ~arm ppc ~ppc64 sparc x86
 LICENSE=BSD-1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/troydhanson/uthash/archive/v2.0.2.tar.gz -> uthash-2.0.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=85535307fa77b0a320b4a1e5e081b921
+_md5_=cb2d8e1457c7ed659c7a0513798b71b4
diff --git a/metadata/md5-cache/dev-libs/vc-1.3.0 b/metadata/md5-cache/dev-libs/vc-1.3.0
index be3d609fa2bf..928726251c08 100644
--- a/metadata/md5-cache/dev-libs/vc-1.3.0
+++ b/metadata/md5-cache/dev-libs/vc-1.3.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/VcDevel/Vc
 IUSE=test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-dp.dat -> vc-1.3.0-reference-acos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-sp.dat -> vc-1.3.0-reference-acos-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-dp.dat -> vc-1.3.0-reference-asin-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-sp.dat -> vc-1.3.0-reference-asin-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-dp.dat -> vc-1.3.0-reference-atan-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-sp.dat -> vc-1.3.0-reference-atan-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-dp.dat -> vc-1.3.0-reference-ln-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-sp.dat -> vc-1.3.0-reference-ln-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-dp.dat -> vc-1.3.0-reference-log2-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-sp.dat -> vc-1.3.0-reference-log2-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-dp.dat -> vc-1.3.0-reference-log10-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-sp.dat -> vc-1.3.0-reference-log10-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-dp.dat -> vc-1.3.0-reference-sincos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-sp.dat -> vc-1.3.0-reference-sincos-sp.dat ) https://github.com/VcDevel/Vc/archive/1.3.0.tar.gz -> vc-1.3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c39f640ed871536d181672e387fd846
+_md5_=d91b1ec829097b9d2f707ad4db3b7ea9
diff --git a/metadata/md5-cache/dev-libs/vc-1.3.3 b/metadata/md5-cache/dev-libs/vc-1.3.3
index 52d4b4f34f1f..fb918aebc228 100644
--- a/metadata/md5-cache/dev-libs/vc-1.3.3
+++ b/metadata/md5-cache/dev-libs/vc-1.3.3
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/VcDevel/Vc
 IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-dp.dat -> vc-1.3.3-reference-acos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-acos-sp.dat -> vc-1.3.3-reference-acos-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-dp.dat -> vc-1.3.3-reference-asin-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-asin-sp.dat -> vc-1.3.3-reference-asin-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-dp.dat -> vc-1.3.3-reference-atan-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-atan-sp.dat -> vc-1.3.3-reference-atan-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-dp.dat -> vc-1.3.3-reference-ln-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-ln-sp.dat -> vc-1.3.3-reference-ln-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-dp.dat -> vc-1.3.3-reference-log2-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log2-sp.dat -> vc-1.3.3-reference-log2-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-dp.dat -> vc-1.3.3-reference-log10-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-log10-sp.dat -> vc-1.3.3-reference-log10-sp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-dp.dat -> vc-1.3.3-reference-sincos-dp.dat ) test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/reference-sincos-sp.dat -> vc-1.3.3-reference-sincos-sp.dat ) https://github.com/VcDevel/Vc/archive/1.3.3.tar.gz -> vc-1.3.3.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2bfa8ea29a7fed4d68260d5e880b24f0
+_md5_=c0439f8f11fc53c98a3a777fc602ee6b
diff --git a/metadata/md5-cache/dev-libs/volume_key-0.3.12 b/metadata/md5-cache/dev-libs/volume_key-0.3.12
index a609f31eaa6c..a81e4406bff1 100644
--- a/metadata/md5-cache/dev-libs/volume_key-0.3.12
+++ b/metadata/md5-cache/dev-libs/volume_key-0.3.12
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/gpgme dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-apps/util-linux sys-fs/cryptsetup:=
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/volume_key/volume_key-0.3.12.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f5381b97b7560e5800b56f58e19a5611
+_md5_=ecb0ced46c99e1da806b6c1237f16f36
diff --git a/metadata/md5-cache/dev-libs/weston-3.0.0 b/metadata/md5-cache/dev-libs/weston-3.0.0
index ed678c6e156f..b5eb63b8d602 100644
--- a/metadata/md5-cache/dev-libs/weston-3.0.0
+++ b/metadata/md5-cache/dev-libs/weston-3.0.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=MIT CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.12.0 >=dev-libs/wayland-protocols-1.8 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.30 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) dbus? ( >=sys-apps/dbus-1.6 ) drm? ( media-libs/mesa[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) unwind? ( sys-libs/libunwind ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 REQUIRED_USE=drm? ( gles2 ) screen-sharing? ( rdp ) systemd? ( dbus ) test? ( headless xwayland ) wayland-compositor? ( gles2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/weston-3.0.0.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a644e6ca644ab562639c4b49496b8b8e
+_md5_=3627759d82527c96d63bd27fb24966d4
diff --git a/metadata/md5-cache/dev-libs/weston-7.0.0 b/metadata/md5-cache/dev-libs/weston-7.0.0
index 002204869f94..b7da1655dcb6 100644
--- a/metadata/md5-cache/dev-libs/weston-7.0.0
+++ b/metadata/md5-cache/dev-libs/weston-7.0.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2 ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/weston-7.0.0.tar.xz
 _eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3a27c5df8c36f2997e8a8dad5ab5c60
+_md5_=0e9c5f6bc23ad15970e119a67bcfc42d
diff --git a/metadata/md5-cache/dev-libs/weston-9999 b/metadata/md5-cache/dev-libs/weston-9999
index e8a3fdd96322..0062a1c12ddf 100644
--- a/metadata/md5-cache/dev-libs/weston-9999
+++ b/metadata/md5-cache/dev-libs/weston-9999
@@ -9,6 +9,7 @@ LICENSE=MIT CC-BY-SA-3.0
 PROPERTIES=live
 RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2 ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3a27c5df8c36f2997e8a8dad5ab5c60
+_md5_=0e9c5f6bc23ad15970e119a67bcfc42d
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1 b/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
index 7d6f36493cd8..31c470aad8f5 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
+++ b/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
@@ -7,7 +7,8 @@ IUSE=cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu s
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18941c91cc4b9d485d31b63d85f6614a
+_md5_=599e760ded2213a90c2388958f4ea4df
diff --git a/metadata/md5-cache/dev-libs/xerces-c-9999 b/metadata/md5-cache/dev-libs/xerces-c-9999
index 6ffd9a7942fb..a81cd40e0a5e 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-9999
+++ b/metadata/md5-cache/dev-libs/xerces-c-9999
@@ -7,6 +7,7 @@ IUSE=cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu s
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	76e4ab6ae9cda8407c34d0b9a086f81c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=400e45acf19b24b2bfc030c30339758e
+_md5_=5508b3f338a3dda8f28e56e1bf8ed4fc
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.32.05-r1 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.32.05-r1
index b7866d3862a8..2c98f00fe647 100644
--- a/metadata/md5-cache/dev-libs/xmlrpc-c-1.32.05-r1
+++ b/metadata/md5-cache/dev-libs/xmlrpc-c-1.32.05-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~a
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses sys-libs/readline curl? ( net-misc/curl ) libxml2? ( dev-libs/libxml2 )
 REQUIRED_USE=test? ( static-libs abyss curl cxx ) tools? ( curl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~maksbotan/xmlrpc-c-1.32.05.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_=07fd2f52bf77abae136e6f83e3d66491
+_md5_=c0a2c065d342e441fe1a309aed6eced8
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1
index 36ed457d49d8..f8e7367686ea 100644
--- a/metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1
+++ b/metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1
@@ -8,6 +8,7 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= curl? ( net-misc/curl ) libxml2? ( dev-libs/libxml2 )
 REQUIRED_USE=test? ( abyss curl cxx ) tools? ( curl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlrpc-c/xmlrpc-c-1.39.11.tgz
-_md5_=e17ee82203a677afa8bcc761702fa2f8
+_md5_=73bbd0e4fde6f84e576daeb3fe2e9a06
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.2.28 b/metadata/md5-cache/dev-libs/xmlsec-1.2.28
index 285c03bbbc5b..cc6f9e2706d8 100644
--- a/metadata/md5-cache/dev-libs/xmlsec-1.2.28
+++ b/metadata/md5-cache/dev-libs/xmlsec-1.2.28
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.7.4:= >=dev-libs/libxslt-1.0.20:= gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= ) gnutls? ( >=net-libs/gnutls-2.8.0:= ) nss? ( >=dev-libs/nspr-4.4.1:= >=dev-libs/nss-3.9:= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 REQUIRED_USE=|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.28.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3eadc1e97693c81e92f9538e1bfddb64
+_md5_=0e71188342e2538951e6c712d19e6e1d
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.2.29 b/metadata/md5-cache/dev-libs/xmlsec-1.2.29
index a5d80935f37e..cb80fd43615c 100644
--- a/metadata/md5-cache/dev-libs/xmlsec-1.2.29
+++ b/metadata/md5-cache/dev-libs/xmlsec-1.2.29
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.7.4:= >=dev-libs/libxslt-1.0.20:= gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= ) gnutls? ( >=net-libs/gnutls-2.8.0:= ) nss? ( >=dev-libs/nspr-4.4.1:= >=dev-libs/nss-3.9:= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 REQUIRED_USE=|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.29.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7210c85dbc59fbadea461ba9868c272f
+_md5_=ead167fdde2109af30b4f58004e0c24a
diff --git a/metadata/md5-cache/dev-libs/zlog-1.2.12 b/metadata/md5-cache/dev-libs/zlog-1.2.12
index 60bc5f622d6c..a23a0726f889 100644
--- a/metadata/md5-cache/dev-libs/zlog-1.2.12
+++ b/metadata/md5-cache/dev-libs/zlog-1.2.12
@@ -5,7 +5,8 @@ HOMEPAGE=http://hardysimpson.github.io/zlog/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HardySimpson/zlog/archive/1.2.12.tar.gz -> zlog-v1.2.12.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_=9b098121d244c9416cbc1149cf921a61
+_md5_=d5c38cadef42fb89059cd81e552f7fe4
diff --git a/metadata/md5-cache/dev-libs/zlog-1.2.12-r1 b/metadata/md5-cache/dev-libs/zlog-1.2.12-r1
index 8e8d7a636425..978cff9ad951 100644
--- a/metadata/md5-cache/dev-libs/zlog-1.2.12-r1
+++ b/metadata/md5-cache/dev-libs/zlog-1.2.12-r1
@@ -5,7 +5,8 @@ HOMEPAGE=http://hardysimpson.github.io/zlog/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HardySimpson/zlog/archive/1.2.12.tar.gz -> zlog-v1.2.12.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=12d15f9bc9c4b3ade5565328ef699788
+_md5_=6850e05f13eb81e2802f05a49338203a
diff --git a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.10 b/metadata/md5-cache/dev-libs/zookeeper-c-3.4.10
index 8c0bca9ac21b..9481b0fb5986 100644
--- a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.10
+++ b/metadata/md5-cache/dev-libs/zookeeper-c-3.4.10
@@ -6,7 +6,8 @@ HOMEPAGE=https://zookeeper.apache.org/
 IUSE=doc static-libs test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.10/zookeeper-3.4.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3d9bb035aafa2b60556eb30c685b395
+_md5_=7b912e2974d800d9bed99290f458a304
diff --git a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.8 b/metadata/md5-cache/dev-libs/zookeeper-c-3.4.8
index b1f2a859de22..f6070505cb5a 100644
--- a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.8
+++ b/metadata/md5-cache/dev-libs/zookeeper-c-3.4.8
@@ -6,6 +6,7 @@ HOMEPAGE=https://zookeeper.apache.org/
 IUSE=doc static-libs test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.8/zookeeper-3.4.8.tar.gz
-_md5_=cbd9ced4cc4670e4b91099daea5f354b
+_md5_=726e3967ba030d286fe29bed7bf89bdd
diff --git a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.9 b/metadata/md5-cache/dev-libs/zookeeper-c-3.4.9
index 11e4bd053bf6..7f79350bcff5 100644
--- a/metadata/md5-cache/dev-libs/zookeeper-c-3.4.9
+++ b/metadata/md5-cache/dev-libs/zookeeper-c-3.4.9
@@ -6,6 +6,7 @@ HOMEPAGE=https://zookeeper.apache.org/
 IUSE=doc static-libs test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.9/zookeeper-3.4.9.tar.gz
-_md5_=cbd9ced4cc4670e4b91099daea5f354b
+_md5_=726e3967ba030d286fe29bed7bf89bdd
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.69 b/metadata/md5-cache/dev-libs/zziplib-0.13.69
index e02e8c6e0352..8fd1c0110b6a 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.69
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.69
@@ -8,7 +8,8 @@ IUSE=doc sdl static-libs test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.69.tar.gz -> zziplib-0.13.69.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=61fbf5e5317f812027c92d1ac3f3a073
+_md5_=1fdd341b9311faded3b97169a9d87304
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1 b/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1
index 8622c9016090..b48747d78543 100644
--- a/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1
+++ b/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 PDEPEND=virtual/commonlisp ~dev-lisp/uiop-3.3.2 virtual/commonlisp
+RESTRICT=!test? ( test )
 SLOT=0/3.3.2-r1
 SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.3.2.tar.gz
 _eclasses_=common-lisp-3	267124db452231b7e159152d88c6674d	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3b781a10748a46175059927c80495e70
+_md5_=6c88843e4df7907a4d5a7e2d7a730340
diff --git a/metadata/md5-cache/dev-lua/lgi-0.9.0 b/metadata/md5-cache/dev-lua/lgi-0.9.0
index 3aa3872f5f6d..71af565505ca 100644
--- a/metadata/md5-cache/dev-lua/lgi-0.9.0
+++ b/metadata/md5-cache/dev-lua/lgi-0.9.0
@@ -7,7 +7,8 @@ IUSE=examples test
 KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pavouk/lgi/archive/0.9.0.tar.gz -> lgi-0.9.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=806d147c5a98390e14854dd1513e21c2
+_md5_=51ce1a7c909c4987bb72233a91d32d93
diff --git a/metadata/md5-cache/dev-lua/lgi-0.9.0-r1 b/metadata/md5-cache/dev-lua/lgi-0.9.0-r1
index e7c4af51b424..4c5c2386e3f9 100644
--- a/metadata/md5-cache/dev-lua/lgi-0.9.0-r1
+++ b/metadata/md5-cache/dev-lua/lgi-0.9.0-r1
@@ -7,7 +7,8 @@ IUSE=examples test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi:0=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pavouk/lgi/archive/0.9.0.tar.gz -> lgi-0.9.0.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=a0e4c02b346a4715f156dc35db5689d9
+_md5_=aff4fe4f4b6a9bb05d3d1c44dc068935
diff --git a/metadata/md5-cache/dev-lua/lgi-0.9.2 b/metadata/md5-cache/dev-lua/lgi-0.9.2
index 6ac88272fd8d..deada4a29f8c 100644
--- a/metadata/md5-cache/dev-lua/lgi-0.9.2
+++ b/metadata/md5-cache/dev-lua/lgi-0.9.2
@@ -8,7 +8,8 @@ IUSE=examples test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:= dev-libs/gobject-introspection dev-libs/glib virtual/libffi:0=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pavouk/lgi/archive/0.9.2.tar.gz -> lgi-0.9.2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=f3de00358bd0d1b310b5593fc2815082
+_md5_=49c41c178952061ecfb5ff7ef3d8ebd3
diff --git a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.6 b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.6
index f62990e42006..7670431a39f5 100644
--- a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.6
+++ b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.6
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:0
 REQUIRED_USE=threads? ( internal-fpconv )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openresty/lua-cjson/archive/2.1.0.6.tar.gz -> lua-cjson-2.1.0.6.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2301ee708f4a1eb8509b26bde71befc0
+_md5_=1eaa5dfe0d8c214b47f5d026a973a7e2
diff --git a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.7 b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.7
index d754de549ac6..ff62feff7e07 100644
--- a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.7
+++ b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.7
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:0
 REQUIRED_USE=threads? ( internal-fpconv )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openresty/lua-cjson/archive/2.1.0.7.tar.gz -> lua-cjson-2.1.0.7.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2301ee708f4a1eb8509b26bde71befc0
+_md5_=1eaa5dfe0d8c214b47f5d026a973a7e2
diff --git a/metadata/md5-cache/dev-lua/luacheck-0.20.0 b/metadata/md5-cache/dev-lua/luacheck-0.20.0
index 0f7c835b898e..ec69c090031b 100644
--- a/metadata/md5-cache/dev-lua/luacheck-0.20.0
+++ b/metadata/md5-cache/dev-lua/luacheck-0.20.0
@@ -7,7 +7,8 @@ IUSE=doc luajit test
 KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-lua/luafilesystem[luajit=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpeterv/luacheck/archive/0.20.0.tar.gz -> luacheck-0.20.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3726b3f16e2a6c34e3e82d9754b962ae
+_md5_=efe04a1bb16b7a41fca362dae6955206
diff --git a/metadata/md5-cache/dev-lua/luassert-1.7.10 b/metadata/md5-cache/dev-lua/luassert-1.7.10
index ed91b0c63ca0..cf766e30b7bd 100644
--- a/metadata/md5-cache/dev-lua/luassert-1.7.10
+++ b/metadata/md5-cache/dev-lua/luassert-1.7.10
@@ -7,7 +7,8 @@ IUSE=luajit test
 KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) >=dev-lua/say-1.2_p1[luajit=]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/luassert/archive/v1.7.10.tar.gz -> luassert-1.7.10.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3dc4aaf5f883c933a7e8d024537baac8
+_md5_=b82edea128b3b12e196d2cdd2c3da60d
diff --git a/metadata/md5-cache/dev-lua/mpack-1.0.4 b/metadata/md5-cache/dev-lua/mpack-1.0.4
index d733a5aafa8c..5c5c567d36d3 100644
--- a/metadata/md5-cache/dev-lua/mpack-1.0.4
+++ b/metadata/md5-cache/dev-lua/mpack-1.0.4
@@ -7,7 +7,8 @@ IUSE=luajit test
 KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tarruda/mpack/archive/1.0.4.tar.gz -> mpack-1.0.4.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=70b3952e77253a06572414190f12eb80
+_md5_=40bd7f765e70dfaea2b02419b5991c5d
diff --git a/metadata/md5-cache/dev-lua/say-1.3_p1-r1 b/metadata/md5-cache/dev-lua/say-1.3_p1-r1
index cc7f4b653433..e9dd738bee55 100644
--- a/metadata/md5-cache/dev-lua/say-1.3_p1-r1
+++ b/metadata/md5-cache/dev-lua/say-1.3_p1-r1
@@ -7,7 +7,8 @@ IUSE=luajit test
 KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz -> say-1.3_p1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=80703be2619484c43fd9c14bca4fa72a
+_md5_=d24418b293e2994c4106d26c2c73c3b3
diff --git a/metadata/md5-cache/dev-ml/alcotest-0.8.1 b/metadata/md5-cache/dev-ml/alcotest-0.8.1
index ac0594ad8b3e..826e664f3949 100644
--- a/metadata/md5-cache/dev-ml/alcotest-0.8.1
+++ b/metadata/md5-cache/dev-ml/alcotest-0.8.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.8.1
 SRC_URI=https://github.com/mirage/alcotest/archive/0.8.1.tar.gz -> alcotest-0.8.1.tar.gz
 _eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=e4b101035b078938c5c75de8559caebf
+_md5_=e88ebb65444a1e01d8632ee831408ba1
diff --git a/metadata/md5-cache/dev-ml/alcotest-0.8.2 b/metadata/md5-cache/dev-ml/alcotest-0.8.2
index bda14cb2713b..20ec2be88a00 100644
--- a/metadata/md5-cache/dev-ml/alcotest-0.8.2
+++ b/metadata/md5-cache/dev-ml/alcotest-0.8.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.8.2
 SRC_URI=https://github.com/mirage/alcotest/archive/0.8.2.tar.gz -> alcotest-0.8.2.tar.gz
 _eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=e4b101035b078938c5c75de8559caebf
+_md5_=e88ebb65444a1e01d8632ee831408ba1
diff --git a/metadata/md5-cache/dev-ml/angstrom-0.7.0 b/metadata/md5-cache/dev-ml/angstrom-0.7.0
index 2ba23dfccc50..61f977063216 100644
--- a/metadata/md5-cache/dev-ml/angstrom-0.7.0
+++ b/metadata/md5-cache/dev-ml/angstrom-0.7.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.7.0
 SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.7.0.tar.gz -> angstrom-0.7.0.tar.gz
 _eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=cc2f65c3654d5c5d63ce38283906b580
+_md5_=115d273fb0d6332702629bb80755a2cc
diff --git a/metadata/md5-cache/dev-ml/atd-1.12.0 b/metadata/md5-cache/dev-ml/atd-1.12.0
index 2bf8258b0193..427f1abfe286 100644
--- a/metadata/md5-cache/dev-ml/atd-1.12.0
+++ b/metadata/md5-cache/dev-ml/atd-1.12.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] dev-ml/menhir:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.12.0
 SRC_URI=https://github.com/mjambon/atd/archive/v1.12.0.tar.gz -> atd-1.12.0.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=05a5412d5359c6c489fb90a5e32c14be
+_md5_=ae5e7d835b5f1678435a90cedc711239
diff --git a/metadata/md5-cache/dev-ml/batteries-2.7.0 b/metadata/md5-cache/dev-ml/batteries-2.7.0
index 039d0b400f8f..bc27fb1569b1 100644
--- a/metadata/md5-cache/dev-ml/batteries-2.7.0
+++ b/metadata/md5-cache/dev-ml/batteries-2.7.0
@@ -7,7 +7,8 @@ IUSE=test +ocamlopt debug
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/camomile:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/2.7.0
 SRC_URI=https://github.com/ocaml-batteries-team/batteries-included/archive/v2.7.0.tar.gz -> batteries-2.7.0.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3bb20054f840efe54ab07376895c7c5a
+_md5_=951448ab2ff88af375f944ee07a22905
diff --git a/metadata/md5-cache/dev-ml/bos-0.1.6 b/metadata/md5-cache/dev-ml/bos-0.1.6
index a00a95f1e018..5f6c178bfeb3 100644
--- a/metadata/md5-cache/dev-ml/bos-0.1.6
+++ b/metadata/md5-cache/dev-ml/bos-0.1.6
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:= dev-ml/rresult:= dev-ml/astring:= dev-ml/fpath:= dev-ml/fmt:= dev-ml/logs:=
+RESTRICT=!test? ( test )
 SLOT=0/0.1.6
 SRC_URI=http://erratique.ch/software/bos/releases/bos-0.1.6.tbz
-_md5_=5feb11d48b357c79cd257e71a3d398cf
+_md5_=2f5814171c21faa368bee3b9bb577962
diff --git a/metadata/md5-cache/dev-ml/capnp-ocaml-3.0.0 b/metadata/md5-cache/dev-ml/capnp-ocaml-3.0.0
index 625aa7a82c6c..e4124238027d 100644
--- a/metadata/md5-cache/dev-ml/capnp-ocaml-3.0.0
+++ b/metadata/md5-cache/dev-ml/capnp-ocaml-3.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-ml/core_kernel:= dev-ml/ocaml-extunix:= dev-ml/ocplib-endian:= dev-ml/res:= dev-ml/ocaml-uint:= dev-libs/capnproto:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/pelzlpj/capnp-ocaml/archive/v3.0.0.tar.gz -> capnp-ocaml-3.0.0.tar.gz
 _eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=a1e142261b117d0c118b1c79b7e385d5
+_md5_=c5f0cbf17b89df7dce39cb4865d7f1b9
diff --git a/metadata/md5-cache/dev-ml/capnp-ocaml-3.1.0 b/metadata/md5-cache/dev-ml/capnp-ocaml-3.1.0
index bc18abacb6c8..bd64159f4d8d 100644
--- a/metadata/md5-cache/dev-ml/capnp-ocaml-3.1.0
+++ b/metadata/md5-cache/dev-ml/capnp-ocaml-3.1.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-ml/core_kernel:= dev-ml/ocaml-extunix:= dev-ml/ocplib-endian:= dev-ml/res:= dev-ml/ocaml-uint:= dev-libs/capnproto:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/3.1.0
 SRC_URI=https://github.com/pelzlpj/capnp-ocaml/archive/v3.1.0.tar.gz -> capnp-ocaml-3.1.0.tar.gz
 _eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=a1e142261b117d0c118b1c79b7e385d5
+_md5_=c5f0cbf17b89df7dce39cb4865d7f1b9
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.0 b/metadata/md5-cache/dev-ml/cmdliner-1.0.0
index e23508b5ddd7..74ebda5e0d91 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.0
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
+RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.0.tbz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=673c48e7a65d135d5665b2c36846e6eb
+_md5_=79feb9b363ab3054388233c3afeb32cf
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.1 b/metadata/md5-cache/dev-ml/cmdliner-1.0.1
index a6d6175f197e..9e093f26dc33 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.1
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.1
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
+RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.1.tbz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=673c48e7a65d135d5665b2c36846e6eb
+_md5_=79feb9b363ab3054388233c3afeb32cf
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.2 b/metadata/md5-cache/dev-ml/cmdliner-1.0.2
index 15fe13883677..e0b570073516 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.2
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.2
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
+RESTRICT=!test? ( test )
 SLOT=0/1.0.2
 SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=673c48e7a65d135d5665b2c36846e6eb
+_md5_=79feb9b363ab3054388233c3afeb32cf
diff --git a/metadata/md5-cache/dev-ml/cudf-0.8-r1 b/metadata/md5-cache/dev-ml/cudf-0.8-r1
index 188f343b6431..347018eacef0 100644
--- a/metadata/md5-cache/dev-ml/cudf-0.8-r1
+++ b/metadata/md5-cache/dev-ml/cudf-0.8-r1
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-libs/glib:2 dev-ml/camlp4:= dev-ml/cppo:=
+RESTRICT=!test? ( test )
 SLOT=0/0.8
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/34659/cudf-0.8.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=be87acb995abe5a2dc59d3ea36c4be3e
+_md5_=18219ae01e558a6a4550ddec583ed33a
diff --git a/metadata/md5-cache/dev-ml/fmt-0.8.4 b/metadata/md5-cache/dev-ml/fmt-0.8.4
index 8e8c512296a2..84b9919530b0 100644
--- a/metadata/md5-cache/dev-ml/fmt-0.8.4
+++ b/metadata/md5-cache/dev-ml/fmt-0.8.4
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.8.4
 SRC_URI=http://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=3fa32445820b291255570863e7370f5f
+_md5_=a5e4eaeea3f00b0446c044271b023de4
diff --git a/metadata/md5-cache/dev-ml/gsl-ocaml-1.19.1 b/metadata/md5-cache/dev-ml/gsl-ocaml-1.19.1
index d04c491ab19e..580efcc3f9e5 100644
--- a/metadata/md5-cache/dev-ml/gsl-ocaml-1.19.1
+++ b/metadata/md5-cache/dev-ml/gsl-ocaml-1.19.1
@@ -7,7 +7,8 @@ IUSE=examples test +ocamlopt debug doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sci-libs/gsl-1.19 !dev-ml/ocamlgsl >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mmottl/gsl-ocaml/releases/download/v1.19.1/gsl-ocaml-1.19.1.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9627e4bd10aec9b569f23141d2b7f820
+_md5_=e51bbfdd30287784d373ea37fdd5a225
diff --git a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14 b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
index 179dad6adcb0..5c48d67bdee6 100644
--- a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
+++ b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.0_beta14
 SRC_URI=https://github.com/janestreet/jbuilder/archive/1.0+beta14.tar.gz -> jbuilder-1.0-beta14.tar.gz
 _eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=281533637252a9fb9df3516f20d92c45
+_md5_=c506b3bd50e5dc7af6ef1e8ceab4a7b5
diff --git a/metadata/md5-cache/dev-ml/js_of_ocaml-3.0.0 b/metadata/md5-cache/dev-ml/js_of_ocaml-3.0.0
index 68bb17989ab7..5c35ada2d10e 100644
--- a/metadata/md5-cache/dev-ml/js_of_ocaml-3.0.0
+++ b/metadata/md5-cache/dev-ml/js_of_ocaml-3.0.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] camlp4? ( dev-ml/camlp4:= ) dev-ml/cmdliner:= dev-ml/cppo:= lwt? ( >=dev-ml/lwt-2.4.4:= ) dev-ml/ocamlbuild:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= dev-ml/uchar:= ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= ) xml? ( >=dev-ml/tyxml-4:= dev-ml/reactiveData:= )
 REQUIRED_USE=xml? ( ppx )
+RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/ocsigen/js_of_ocaml/archive/3.0.0.tar.gz -> js_of_ocaml-3.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b0ac6d60087ed4e9921892d3d8547b6
+_md5_=f054e0c49f7c6079c28853eae21a3a8b
diff --git a/metadata/md5-cache/dev-ml/js_of_ocaml-9999 b/metadata/md5-cache/dev-ml/js_of_ocaml-9999
index a363a0898e2b..33c34dc81cfa 100644
--- a/metadata/md5-cache/dev-ml/js_of_ocaml-9999
+++ b/metadata/md5-cache/dev-ml/js_of_ocaml-9999
@@ -8,6 +8,7 @@ LICENSE=LGPL-2.1-with-linking-exception
 PROPERTIES=live
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] camlp4? ( dev-ml/camlp4:= ) dev-ml/cmdliner:= dev-ml/cppo:= lwt? ( >=dev-ml/lwt-2.4.4:= ) dev-ml/ocamlbuild:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= dev-ml/uchar:= ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= ) xml? ( >=dev-ml/tyxml-4:= dev-ml/reactiveData:= )
 REQUIRED_USE=xml? ( ppx )
+RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1409ef1c5ac0ae0ade05e3662d0ce652
+_md5_=7a2d109691f312ead72a22cd45434578
diff --git a/metadata/md5-cache/dev-ml/logs-0.6.2 b/metadata/md5-cache/dev-ml/logs-0.6.2
index 0080d23d18fc..467ac2b1330e 100644
--- a/metadata/md5-cache/dev-ml/logs-0.6.2
+++ b/metadata/md5-cache/dev-ml/logs-0.6.2
@@ -7,7 +7,8 @@ IUSE=javascript +fmt cli +lwt test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) fmt? ( dev-ml/fmt:= ) cli? ( dev-ml/cmdliner:=[ocamlopt] ) lwt? ( dev-ml/lwt:= )
+RESTRICT=!test? ( test )
 SLOT=0/0.6.2
 SRC_URI=http://erratique.ch/software/logs/releases/logs-0.6.2.tbz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=fe8d609bbec62c8c124aa8ecc0cac5bd
+_md5_=ebd5b5dbf0d5590b0d6ac40172e819c2
diff --git a/metadata/md5-cache/dev-ml/markup-0.7.5 b/metadata/md5-cache/dev-ml/markup-0.7.5
index c9f4e5f62e4a..97106cb06eef 100644
--- a/metadata/md5-cache/dev-ml/markup-0.7.5
+++ b/metadata/md5-cache/dev-ml/markup-0.7.5
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/lwt:=[ocamlopt(+)] >=dev-ml/uutf-1.0:=[ocamlopt]
+RESTRICT=!test? ( test )
 SLOT=0/0.7.5p1
 SRC_URI=https://github.com/aantron/markup.ml/archive/0.7.5.tar.gz -> markup-0.7.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f8c29b4ea209c7e079c79557c3ba214
+_md5_=c8e41c31ccca9e6ef86c6fc63b14b009
diff --git a/metadata/md5-cache/dev-ml/mtime-1.1.0 b/metadata/md5-cache/dev-ml/mtime-1.1.0
index c0efb708a59a..85ebffd90503 100644
--- a/metadata/md5-cache/dev-ml/mtime-1.1.0
+++ b/metadata/md5-cache/dev-ml/mtime-1.1.0
@@ -7,7 +7,8 @@ IUSE=javascript test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.1.0
 SRC_URI=http://erratique.ch/software/mtime/releases/mtime-1.1.0.tbz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	3f1ccc0b5a5708088c2c156d4ca79a20	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24e3ec0e91fa8a013f4e7d8dde5223a6
+_md5_=2913272b04fe905f4e39cf85fc90c602
diff --git a/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0 b/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0
index 72b12b268fd4..c5c3d5b4a929 100644
--- a/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0
+++ b/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/2.2.0
 SRC_URI=https://github.com/mirage/ocaml-base64/archive/v2.2.0.tar.gz -> ocaml-base64-2.2.0.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=9232f5a16cae33937ada6cc94028e909
+_md5_=f0d607f5775ed53b334dd4e6437651f1
diff --git a/metadata/md5-cache/dev-ml/ocaml-containers-1.3 b/metadata/md5-cache/dev-ml/ocaml-containers-1.3
index 5af5abd35b4e..863205f39e8a 100644
--- a/metadata/md5-cache/dev-ml/ocaml-containers-1.3
+++ b/metadata/md5-cache/dev-ml/ocaml-containers-1.3
@@ -7,7 +7,8 @@ IUSE=test +ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-ml/result:= >=dev-ml/sequence-0.9:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.3
 SRC_URI=https://github.com/c-cube/ocaml-containers/archive/1.3.tar.gz -> ocaml-containers-1.3.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91f2cc8c0efc208f7a66e46397deefb0
+_md5_=e7643e2af5357afe212ab0752754dee7
diff --git a/metadata/md5-cache/dev-ml/ocaml-containers-1.4 b/metadata/md5-cache/dev-ml/ocaml-containers-1.4
index fdebb54fe637..7c5f170dcc27 100644
--- a/metadata/md5-cache/dev-ml/ocaml-containers-1.4
+++ b/metadata/md5-cache/dev-ml/ocaml-containers-1.4
@@ -7,7 +7,8 @@ IUSE=test +ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-ml/result:= >=dev-ml/sequence-0.9:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.4
 SRC_URI=https://github.com/c-cube/ocaml-containers/archive/1.4.tar.gz -> ocaml-containers-1.4.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91f2cc8c0efc208f7a66e46397deefb0
+_md5_=e7643e2af5357afe212ab0752754dee7
diff --git a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1 b/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
index b2488f197bc2..5065404d81d8 100644
--- a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
+++ b/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
@@ -7,7 +7,8 @@ IUSE=async +lwt +ppx test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=async? ( dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/core_kernel:= ) lwt? ( dev-ml/lwt:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/ppx_tools_versioned-5.0.1:= ) dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/3.1.1
 SRC_URI=https://github.com/mirage/ocaml-cstruct/archive/v3.1.1.tar.gz -> ocaml-cstruct-3.1.1.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=60a5b9226fb3932386dc49b611ae6b0a
+_md5_=7baef6bed6fb57211c8515e34f89827f
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2
index 5cd18bd082ed..6e38765c07a9 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 arm x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi
+RESTRICT=!test? ( test )
 SLOT=0/0.11.2
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.11.2.tar.gz -> ocaml-ctypes-0.11.2.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=ea6cb045597ca298e54f1268a9214d84
+_md5_=d78ba8f1023d3331b5e919ed504a2dc6
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3
index bc4f41e43ad7..5a2fdedd6077 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi
+RESTRICT=!test? ( test )
 SLOT=0/0.11.3
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.11.3.tar.gz -> ocaml-ctypes-0.11.3.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=a797bd031ebdb46eb6681029a552358e
+_md5_=ae07a84c3c6946a37564283b8fb4a9b5
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
index f2c48a124304..b5ef1a10a692 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi dev-ml/integers:=
+RESTRICT=!test? ( test )
 SLOT=0/0.12.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.12.1.tar.gz -> ocaml-ctypes-0.12.1.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=9878d7c9a54dd50f7ac2176b2d6eb2e8
+_md5_=302ee12fcc75e965601a87528422e600
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
index 94d9869b1ce1..01fb8f760340 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi dev-ml/integers:=
+RESTRICT=!test? ( test )
 SLOT=0/0.13.0
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.13.0.tar.gz -> ocaml-ctypes-0.13.0.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=9878d7c9a54dd50f7ac2176b2d6eb2e8
+_md5_=302ee12fcc75e965601a87528422e600
diff --git a/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0 b/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0
index bcc8829058fe..00c86f104b0a 100644
--- a/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0
+++ b/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-ml/result:= dev-lang/ocaml:=
+RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=https://github.com/inhabitedtype/ocaml-dispatch/archive/0.4.0.tar.gz -> ocaml-dispatch-0.4.0.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=5ba3990520dbb30f7b5915532ee0a3cc
+_md5_=bd2ddc078e2275a1885b5e49a121f906
diff --git a/metadata/md5-cache/dev-ml/ocaml-expat-1.0.0 b/metadata/md5-cache/dev-ml/ocaml-expat-1.0.0
index ee0e5ac20309..620167e707c8 100644
--- a/metadata/md5-cache/dev-ml/ocaml-expat-1.0.0
+++ b/metadata/md5-cache/dev-ml/ocaml-expat-1.0.0
@@ -7,7 +7,8 @@ IUSE=doc +ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/whitequark/ocaml-expat/archive/v1.0.0.tar.gz -> ocaml-expat-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6505a2a75e932fb8cbfe8f64cf9898a
+_md5_=a6d17d3e66d9ed1d794b78cb238e4f50
diff --git a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0 b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0
index cf7338165f35..0d35dfec8255 100644
--- a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0
+++ b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0
@@ -7,7 +7,8 @@ IUSE=doc +ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.1.0
 SRC_URI=https://github.com/whitequark/ocaml-expat/archive/v1.1.0.tar.gz -> ocaml-expat-1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6505a2a75e932fb8cbfe8f64cf9898a
+_md5_=a6d17d3e66d9ed1d794b78cb238e4f50
diff --git a/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5 b/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
index e0fe7727a7dd..6f9ed144be54 100644
--- a/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
+++ b/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
@@ -7,7 +7,8 @@ IUSE=test +ocamlopt debug doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/batteries:= dev-ml/pcre-ocaml:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.0.5
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1372/ocaml-expect-0.0.5.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b484d41378ba0439ba4eaedc218a31b
+_md5_=b77c289b8bc39aba3bd1196dd6099bcc
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.5-r1 b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.5-r1
index 847df4cb5a04..a2149e40ecef 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.5-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.5-r1
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12.1:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1433/ocaml-gettext-0.3.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=60c0ecb70409a954b411ad5b4fa7619f
+_md5_=c494a098ec993436cdb7e8991626b600
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7 b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7
index 8f6efa682bc0..94ee43b878d7 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12.1:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.7
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/0.3.7.tar.gz -> ocaml-gettext-0.3.7.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9f15677795ff8198a71302427f9d54e2
+_md5_=3c590ae8098d8f545c609009fe036573
diff --git a/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0 b/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
index 0e6d886f1ee2..ce7b53a2322c 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
+++ b/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-lang/ocaml:=[ocamlopt?] >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/2.8.0
 SRC_URI=https://github.com/mirage/ocaml-ipaddr/archive/2.8.0.tar.gz -> ocaml-ipaddr-2.8.0.tar.gz
 _eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=47b583b39ce07bc7e5cee44984a9660c
+_md5_=bd5949dbdf484129d9b3b6ad716fb3cb
diff --git a/metadata/md5-cache/dev-ml/ocaml-re-1.7.1 b/metadata/md5-cache/dev-ml/ocaml-re-1.7.1
index 669ecb997fcf..218c0025b450 100644
--- a/metadata/md5-cache/dev-ml/ocaml-re-1.7.1
+++ b/metadata/md5-cache/dev-ml/ocaml-re-1.7.1
@@ -7,7 +7,8 @@ IUSE=test +ocamlopt debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.7.1
 SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.7.1.tar.gz -> ocaml-re-1.7.1.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ac6ddcaf5838eaa7219126af17b7423
+_md5_=93d768c93ecbd5a8b43f0d736aeb17c7
diff --git a/metadata/md5-cache/dev-ml/ocaml-redis-0.3.5 b/metadata/md5-cache/dev-ml/ocaml-redis-0.3.5
index 881f175100c0..f7775d5c557f 100644
--- a/metadata/md5-cache/dev-ml/ocaml-redis-0.3.5
+++ b/metadata/md5-cache/dev-ml/ocaml-redis-0.3.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-re:= dev-ml/uuidm:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://github.com/0xffea/ocaml-redis/archive/0.3.5.tar.gz -> ocaml-redis-0.3.5.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=fd19c9c0ee42fcba57e67e66138e4c62
+_md5_=910652294e3a14baeeadeb8e7f80483c
diff --git a/metadata/md5-cache/dev-ml/ocaml-redis-lwt-0.3.5 b/metadata/md5-cache/dev-ml/ocaml-redis-lwt-0.3.5
index d745a0541f57..04340ac7dc61 100644
--- a/metadata/md5-cache/dev-ml/ocaml-redis-lwt-0.3.5
+++ b/metadata/md5-cache/dev-ml/ocaml-redis-lwt-0.3.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-redis:= dev-ml/lwt:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://github.com/0xffea/ocaml-redis/archive/0.3.5.tar.gz -> ocaml-redis-0.3.5.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=c39fe4340c4786046886c945432cc0bc
+_md5_=4846e1b4dde3d11f5ddbf8a1eae10bfe
diff --git a/metadata/md5-cache/dev-ml/ocaml-redis-sync-0.3.5 b/metadata/md5-cache/dev-ml/ocaml-redis-sync-0.3.5
index 10922d3660eb..2b3f27056116 100644
--- a/metadata/md5-cache/dev-ml/ocaml-redis-sync-0.3.5
+++ b/metadata/md5-cache/dev-ml/ocaml-redis-sync-0.3.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-redis:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://github.com/0xffea/ocaml-redis/archive/0.3.5.tar.gz -> ocaml-redis-0.3.5.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=7090d74a8da02fff55aa049d4806eb3c
+_md5_=b54cc9d6d7242acc9b933804972a9d0f
diff --git a/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4 b/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
index 22f2fee6b4e0..bf0c81bfb83e 100644
--- a/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
+++ b/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/ocaml-re:= dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-ml/stringext:= dev-ml/type-conv:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.9.4
 SRC_URI=https://github.com/mirage/ocaml-uri/archive/v1.9.4.tar.gz -> ocaml-uri-1.9.4.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=936dee0ca12d3dd49a70c83a83827df3
+_md5_=366defb3d072a037c03ab776d2b4fffe
diff --git a/metadata/md5-cache/dev-ml/ocamlbuild-0.11.0 b/metadata/md5-cache/dev-ml/ocamlbuild-0.11.0
index 5e6ea941b967..97bedc87ba88 100644
--- a/metadata/md5-cache/dev-ml/ocamlbuild-0.11.0
+++ b/metadata/md5-cache/dev-ml/ocamlbuild-0.11.0
@@ -7,6 +7,7 @@ IUSE=+ocamlopt test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] !<dev-ml/findlib-1.6.1-r1
+RESTRICT=!test? ( test )
 SLOT=0/0.11.0
 SRC_URI=https://github.com/ocaml/ocamlbuild/archive/0.11.0.tar.gz -> ocamlbuild-0.11.0.tar.gz
-_md5_=189102e860196aa7d93a9cb1c11051af
+_md5_=c8f676df06d4d2d05ee999189d9e4231
diff --git a/metadata/md5-cache/dev-ml/onanomsg-1.0-r2 b/metadata/md5-cache/dev-ml/onanomsg-1.0-r2
index 8e92a33c61ac..c42461675033 100644
--- a/metadata/md5-cache/dev-ml/onanomsg-1.0-r2
+++ b/metadata/md5-cache/dev-ml/onanomsg-1.0-r2
@@ -7,7 +7,8 @@ IUSE=+lwt +ocamlopt test
 KEYWORDS=~amd64
 LICENSE=WTFPL-2
 RDEPEND=dev-libs/nanomsg:= dev-lang/ocaml:=[ocamlopt?] dev-ml/ocaml-ctypes:= dev-ml/ocaml-ipaddr:=[ocamlopt?] dev-ml/sexplib:= dev-ml/ppx_deriving:=[ocamlopt?] dev-ml/ocaml-containers:=[ocamlopt?] dev-ml/ocaml-bigstring:= lwt? ( dev-ml/lwt:=[ocamlopt(+)?] ) >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.0-bigstring
 SRC_URI=https://github.com/rgrinberg/onanomsg/archive/1.0.tar.gz -> onanomsg-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	3f1ccc0b5a5708088c2c156d4ca79a20	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61b5eba20786e97537a3b8b7ef08be7b
+_md5_=1b15be7dc1f76fb50a5f6db13fa78d13
diff --git a/metadata/md5-cache/dev-ml/opam-1.3.1-r1 b/metadata/md5-cache/dev-ml/opam-1.3.1-r1
index efa8bbfb89d9..95f3da1089b9 100644
--- a/metadata/md5-cache/dev-ml/opam-1.3.1-r1
+++ b/metadata/md5-cache/dev-ml/opam-1.3.1-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-3-with-linking-exception
 RDEPEND=dev-lang/ocaml:= || ( net-misc/wget net-misc/curl ) dev-ml/extlib:= dev-ml/ocaml-re:= dev-ml/ocamlgraph:= dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-5:= dev-ml/uutf:= dev-ml/jsonm:=
+RESTRICT=!test? ( test )
 SLOT=0/1.3.1
 SRC_URI=https://github.com/ocaml/opam/archive/1.3.1.tar.gz -> opam-1.3.1.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_=afd631461720bd37bba0c38aec3b8a3e
+_md5_=73e4a3101c3761a4a6348214cbcaba63
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1 b/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
index 44f4c99f8406..e7df5d81a393 100644
--- a/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
+++ b/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
@@ -7,7 +7,8 @@ IUSE=doc +ocamlopt test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/result:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/4.2
 SRC_URI=https://github.com/ocaml-ppx/ppx_deriving/archive/v4.2.tar.gz -> ppx_deriving-4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	3f1ccc0b5a5708088c2c156d4ca79a20	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbdb709ad564fae109ed33a00089b2a9
+_md5_=50a684a5c7daf6fd58e4ac8b3df38370
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.0 b/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.0
index 152cdd655f95..15c7b4ea0a0b 100644
--- a/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.0
+++ b/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/yojson:= dev-ml/result:= >=dev-ml/ppx_deriving-4:= dev-ml/cppo:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/3.0
 SRC_URI=https://github.com/whitequark/ppx_deriving_yojson/archive/v3.0.tar.gz -> ppx_deriving_yojson-3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	3f1ccc0b5a5708088c2c156d4ca79a20	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c5badd88606f9b236df7f0b20af8b626
+_md5_=4623ed730453fbb98d3781e1685b8caf
diff --git a/metadata/md5-cache/dev-ml/ppx_import-1.2 b/metadata/md5-cache/dev-ml/ppx_import-1.2
index 5536fdcc1332..48b7768bdf8e 100644
--- a/metadata/md5-cache/dev-ml/ppx_import-1.2
+++ b/metadata/md5-cache/dev-ml/ppx_import-1.2
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/ppx_tools:= dev-ml/cppo:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.2
 SRC_URI=https://github.com/whitequark/ppx_import/archive/v1.2.tar.gz -> ppx_import-1.2.tar.gz
 _eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=5296f8d53290ced6c54db8d1ac3f04cd
+_md5_=9db06268349c902b25b45e10de99f9f7
diff --git a/metadata/md5-cache/dev-ml/react-1.2.1 b/metadata/md5-cache/dev-ml/react-1.2.1
index f2743725f834..ce077bc6d683 100644
--- a/metadata/md5-cache/dev-ml/react-1.2.1
+++ b/metadata/md5-cache/dev-ml/react-1.2.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.2.1
 SRC_URI=http://erratique.ch/software/react/releases/react-1.2.1.tbz
 _eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=03339606b39345ecbd8f8cd8dda71ac5
+_md5_=04bb41d5ec647c978d7ffd3317b1a9b6
diff --git a/metadata/md5-cache/dev-ml/stringext-1.5.0 b/metadata/md5-cache/dev-ml/stringext-1.5.0
index 62778046d720..05dedccaaea5 100644
--- a/metadata/md5-cache/dev-ml/stringext-1.5.0
+++ b/metadata/md5-cache/dev-ml/stringext-1.5.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.5.0
 SRC_URI=https://github.com/rgrinberg/stringext/archive/1.5.0.tar.gz -> stringext-1.5.0.tar.gz
 _eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=29825d7226f2562fb9d03aa1521a49d1
+_md5_=6c33702dec8e27042484c71df5e0e8c1
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.1 b/metadata/md5-cache/dev-ml/uutf-1.0.1
index cd508cf71bc7..687d495026f5 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.1
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.1
@@ -7,7 +7,8 @@ IUSE=doc utftrip +ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= )
+RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=http://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=7adb19fb33d0ebe8e713c4bf7fbfaedb
+_md5_=5023dfb5ce0f97856c1dfa6d878de247
diff --git a/metadata/md5-cache/dev-ml/xmlm-1.3.0 b/metadata/md5-cache/dev-ml/xmlm-1.3.0
index 2ae3587f551c..48e8c19aa49c 100644
--- a/metadata/md5-cache/dev-ml/xmlm-1.3.0
+++ b/metadata/md5-cache/dev-ml/xmlm-1.3.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.3.0
 SRC_URI=http://erratique.ch/software/xmlm/releases/xmlm-1.3.0.tbz
 _eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=cc99bd1b9a9bfefa7d74b4d59f8be67b
+_md5_=697fbeb6c76a659a3e09c7fad5bce05a
diff --git a/metadata/md5-cache/dev-perl/Ace-1.920.0-r3 b/metadata/md5-cache/dev-perl/Ace-1.920.0-r3
index 4c890f77b183..dc974ad01d82 100644
--- a/metadata/md5-cache/dev-perl/Ace-1.920.0-r3
+++ b/metadata/md5-cache/dev-perl/Ace-1.920.0-r3
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 dev-perl/Cache-Cache dev-perl/GD elibc_glibc? ( net-libs/libtirpc net-libs/rpcsvc-proto ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/AcePerl-1.92.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=413ddbdf417e064c13e5c7502dd75d7e
+_md5_=797331f5b862702b7b7a3634cdacb8a8
diff --git a/metadata/md5-cache/dev-perl/Acme-Damn-0.80.0 b/metadata/md5-cache/dev-perl/Acme-Damn-0.80.0
index 300e215460cc..cd3d4c933aa7 100644
--- a/metadata/md5-cache/dev-perl/Acme-Damn-0.80.0
+++ b/metadata/md5-cache/dev-perl/Acme-Damn-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IB/IBB/Acme-Damn-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1a6407802dd9cdee1aee07b5d82cd4fb
+_md5_=ed2385ee2153ab0df75e9d99609649e2
diff --git a/metadata/md5-cache/dev-perl/Algorithm-C3-0.100.0 b/metadata/md5-cache/dev-perl/Algorithm-C3-0.100.0
index 1d8987f8ced3..75f96e52af79 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-C3-0.100.0
+++ b/metadata/md5-cache/dev-perl/Algorithm-C3-0.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-aix ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Carp-0.10.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Algorithm-C3-0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9419713d9a16ab751961da3e5972678c
+_md5_=cacf416cc712af22db05ec570bf0aecc
diff --git a/metadata/md5-cache/dev-perl/Algorithm-ClusterPoints-0.80.0 b/metadata/md5-cache/dev-perl/Algorithm-ClusterPoints-0.80.0
index e4e95c82439d..36b1f76fd540 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-ClusterPoints-0.80.0
+++ b/metadata/md5-cache/dev-perl/Algorithm-ClusterPoints-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Algorithm-ClusterPoints-0.08.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ce65010ffccb29a13303d9ab896eba6
+_md5_=6df1342de6e09d4e63abccaa4b28e560
diff --git a/metadata/md5-cache/dev-perl/Algorithm-Dependency-1.110.0-r2 b/metadata/md5-cache/dev-perl/Algorithm-Dependency-1.110.0-r2
index be79f913607d..f06188313365 100644
--- a/metadata/md5-cache/dev-perl/Algorithm-Dependency-1.110.0-r2
+++ b/metadata/md5-cache/dev-perl/Algorithm-Dependency-1.110.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Params-Util-0.31 >=virtual/perl-File-Spec-0.82 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Algorithm-Dependency-1.110.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d161a815e581428b99875151a24174ab
+_md5_=b5007beb3339a048f9fd471844fddb80
diff --git a/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.60.0 b/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.60.0
index 413d1dbcf541..4bbb898812a7 100644
--- a/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.60.0
+++ b/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-Build-1.200.0 >=dev-perl/Capture-Tiny-0.170.0 >=dev-perl/File-chdir-0.100.500 >=dev-perl/Module-Build-0.400.400 >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Archive-Tar-1.400.0 >=virtual/perl-HTTP-Tiny-0.44.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=virtual/perl-Text-ParseWords-3.260.0 dev-perl/Archive-Extract dev-perl/HTML-Parser dev-perl/Shell-Config-Generate dev-perl/Shell-Guess dev-perl/Sort-Versions dev-perl/URI virtual/perl-JSON-PP virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1e7bcd135c2b2f6d3d846f55a2b9ec19
+_md5_=6f1894f9459411c034a16a42548e14cb
diff --git a/metadata/md5-cache/dev-perl/Alien-Build-1.790.0 b/metadata/md5-cache/dev-perl/Alien-Build-1.790.0
index e64a69f000bb..131c155211b0 100644
--- a/metadata/md5-cache/dev-perl/Alien-Build-1.790.0
+++ b/metadata/md5-cache/dev-perl/Alien-Build-1.790.0
@@ -7,7 +7,8 @@ IUSE=test zip examples
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=zip? ( dev-perl/Archive-Zip ) >=dev-perl/Capture-Tiny-0.170.0 virtual/perl-ExtUtils-CBuilder >=virtual/perl-ExtUtils-MakeMaker-6.640.0 >=virtual/perl-ExtUtils-ParseXS-3.300.0 >=dev-perl/FFI-CheckLib-0.110.0 >=dev-perl/File-Which-1.100.0 dev-perl/File-chdir virtual/perl-JSON-PP virtual/perl-Module-Load >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Test-Simple-1.302.15 >=virtual/perl-Text-ParseWords-3.260.0 virtual/pkgconfig dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.79.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=af1ae5898d50937a0210d73b516438b1
+_md5_=1f42635753efef6832462d58460b60f7
diff --git a/metadata/md5-cache/dev-perl/Alien-Libxml2-0.90.0 b/metadata/md5-cache/dev-perl/Alien-Libxml2-0.90.0
index 87f80e1be9d6..d7e41f57d342 100644
--- a/metadata/md5-cache/dev-perl/Alien-Libxml2-0.90.0
+++ b/metadata/md5-cache/dev-perl/Alien-Libxml2-0.90.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-Build-0.730.0 dev-libs/libxml2:2= dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c1fbb2d6a596f43e7f7b8184bbb718be
+_md5_=02ff771bc852ebcd9cf8975189253a0e
diff --git a/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.690.0-r1 b/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.690.0-r1
index 629e3e1608c7..f64d23e49cff 100644
--- a/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.690.0-r1
+++ b/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.690.0-r1
@@ -7,7 +7,8 @@ IUSE=gstreamer opengl test
 KEYWORDS=amd64 ~ia64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=x11-libs/wxGTK-3:3.0[gstreamer=,opengl=,tiff,X] >=dev-perl/Module-Pluggable-2.600.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=abd6a88692f1e836e46a61ce1fe875c1
+_md5_=5ac3e51bc4555e4d8b23b050b3fe0a7e
diff --git a/metadata/md5-cache/dev-perl/Any-Moose-0.270.0 b/metadata/md5-cache/dev-perl/Any-Moose-0.270.0
index 4ca8ca348950..48b9e0ccd56a 100644
--- a/metadata/md5-cache/dev-perl/Any-Moose-0.270.0
+++ b/metadata/md5-cache/dev-perl/Any-Moose-0.270.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Any-Moose-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c654e9ef0da4717d8704b21510615102
+_md5_=7e3ff9114cccd2ac455c2eac4e3b6c19
diff --git a/metadata/md5-cache/dev-perl/AnyEvent-CacheDNS-0.80.0 b/metadata/md5-cache/dev-perl/AnyEvent-CacheDNS-0.80.0
index 8ef5cd436cfe..f1a89d92dfb9 100644
--- a/metadata/md5-cache/dev-perl/AnyEvent-CacheDNS-0.80.0
+++ b/metadata/md5-cache/dev-perl/AnyEvent-CacheDNS-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/AnyEvent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PO/POTYL/AnyEvent-CacheDNS-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e182382228638fefb91d263b07606b82
+_md5_=dbb751aac00cb413b1626965833f3184
diff --git a/metadata/md5-cache/dev-perl/AnyEvent-HTTPD-0.930.0 b/metadata/md5-cache/dev-perl/AnyEvent-HTTPD-0.930.0
index fd311d4906eb..d6e1a88fd1a6 100644
--- a/metadata/md5-cache/dev-perl/AnyEvent-HTTPD-0.930.0
+++ b/metadata/md5-cache/dev-perl/AnyEvent-HTTPD-0.930.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/AnyEvent dev-perl/AnyEvent-HTTP dev-perl/common-sense virtual/perl-IO-Compress dev-perl/Object-Event virtual/perl-Time-Local dev-perl/URI dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EL/ELMEX/AnyEvent-HTTPD-0.93.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e4b6a7e9e268433f1fe53f3e448ed7b9
+_md5_=02ec13c39e8758aa1a952963925cbfb9
diff --git a/metadata/md5-cache/dev-perl/Apache-AuthCookie-3.270.0-r1 b/metadata/md5-cache/dev-perl/Apache-AuthCookie-3.270.0-r1
index aaf8878422f3..bc9cf6898889 100644
--- a/metadata/md5-cache/dev-perl/Apache-AuthCookie-3.270.0-r1
+++ b/metadata/md5-cache/dev-perl/Apache-AuthCookie-3.270.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=www-apache/mod_perl-2 virtual/perl-Carp >=dev-perl/Class-Load-0.30.0 virtual/perl-Encode dev-perl/HTTP-Body dev-perl/Hash-MultiValue dev-perl/WWW-Form-UrlEncoded dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fff301ad863e26c5cb54ee1871586620
+_md5_=7eb3325baf90c7579b1d7e699aac3618
diff --git a/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2 b/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2
index 18ca1af23e80..94f2bded3c4a 100644
--- a/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2
+++ b/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Digest-SHA1-2.10.0 >=virtual/perl-Digest-MD5-2.2 >=dev-perl/DBI-1.30 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Apache-DBI-1.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7dbe5088bc9ee21356e0f7490d216be4
+_md5_=0bb3144f721ccd2d82d60bcdcc9fb8cf
diff --git a/metadata/md5-cache/dev-perl/Apache-LogFormat-Compiler-0.350.0 b/metadata/md5-cache/dev-perl/Apache-LogFormat-Compiler-0.350.0
index 2933b68d17f2..3239711a83eb 100644
--- a/metadata/md5-cache/dev-perl/Apache-LogFormat-Compiler-0.350.0
+++ b/metadata/md5-cache/dev-perl/Apache-LogFormat-Compiler-0.350.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/POSIX-strftime-Compiler-0.300.0 virtual/perl-Time-Local >=dev-lang/perl-5.8.4 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Apache-LogFormat-Compiler-0.35.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=37b1da56abbddaff1706e2095cee34c2
+_md5_=d9e8e2227e272c8f16ef8dbfa828e0e3
diff --git a/metadata/md5-cache/dev-perl/Apache-Session-1.930.0 b/metadata/md5-cache/dev-perl/Apache-Session-1.930.0
index fb77ce88dbec..efdf766945d1 100644
--- a/metadata/md5-cache/dev-perl/Apache-Session-1.930.0
+++ b/metadata/md5-cache/dev-perl/Apache-Session-1.930.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Storable dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0e6eb1e3b5dacbb89021e23d3e902e66
+_md5_=4e1c93faa777c5e47771f82516dc17ea
diff --git a/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1 b/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
index 536cdcf09c54..f04fa01410b7 100644
--- a/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
+++ b/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Linux-Pid !<www-apache/mod_perl-2.0.5 >=www-apache/mod_perl-2.0.5 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Apache-SizeLimit-0.97.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=75abb748058af5eb1e02d57e68530358
+_md5_=7a593e1fc0f19f78b825211f8752bf46
diff --git a/metadata/md5-cache/dev-perl/Apache-Test-1.400.0-r2 b/metadata/md5-cache/dev-perl/Apache-Test-1.400.0-r2
index f8433f88855f..68f0e65066f8 100644
--- a/metadata/md5-cache/dev-perl/Apache-Test-1.400.0-r2
+++ b/metadata/md5-cache/dev-perl/Apache-Test-1.400.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ia64 ~mips ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2* dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.40.tar.gz
 _eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=69ddc8946289df854a8aede3ffb8e564
+_md5_=eb9d0e05bd03e2b2759efae002ba8743
diff --git a/metadata/md5-cache/dev-perl/App-CLI-0.500.0 b/metadata/md5-cache/dev-perl/App-CLI-0.500.0
index 85e1679c0f09..bd1020819d35 100644
--- a/metadata/md5-cache/dev-perl/App-CLI-0.500.0
+++ b/metadata/md5-cache/dev-perl/App-CLI-0.500.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny virtual/perl-Carp dev-perl/Class-Load >=virtual/perl-Getopt-Long-2.350.0 virtual/perl-Locale-Maketext-Simple virtual/perl-Pod-Simple virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.50.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bb39a10b55043c2151f41c976639488c
+_md5_=c972a52104d1c4070a30636ee1348628
diff --git a/metadata/md5-cache/dev-perl/App-Cmd-0.331.0 b/metadata/md5-cache/dev-perl/App-Cmd-0.331.0
index 0ba6d65c3f90..f714145939f7 100644
--- a/metadata/md5-cache/dev-perl/App-Cmd-0.331.0
+++ b/metadata/md5-cache/dev-perl/App-Cmd-0.331.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Capture-Tiny-0.130.0 virtual/perl-Carp >=dev-perl/Class-Load-0.60.0 dev-perl/Data-OptList >=virtual/perl-Getopt-Long-2.390.0 >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/IO-TieCombine dev-perl/Module-Pluggable dev-perl/String-RewritePrefix dev-perl/Sub-Exporter dev-perl/Sub-Install virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.331.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=20bc44c3f84945c29a0992ed39dac869
+_md5_=485d2c601e1da12220815884d0ff2078
diff --git a/metadata/md5-cache/dev-perl/App-Nopaste-1.11.0 b/metadata/md5-cache/dev-perl/App-Nopaste-1.11.0
index 444340a2662e..c3277a70fc8e 100644
--- a/metadata/md5-cache/dev-perl/App-Nopaste-1.11.0
+++ b/metadata/md5-cache/dev-perl/App-Nopaste-1.11.0
@@ -7,7 +7,8 @@ IUSE=+pastebin +browser clipboard github test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Load virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/Getopt-Long-Descriptive dev-perl/JSON-MaybeXS dev-perl/Module-Pluggable dev-perl/Module-Runtime dev-perl/Path-Tiny dev-perl/URI dev-perl/WWW-Mechanize >=dev-perl/namespace-clean-0.190.0 pastebin? ( >=dev-perl/WWW-Pastebin-PastebinCom-Create-1.3.0 ) clipboard? ( dev-perl/Clipboard ) github? ( dev-vcs/git[perl] ) browser? ( dev-perl/Browser-Open ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/App-Nopaste-1.011.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c200aa408f21607b1e37e34e17ff834f
+_md5_=dc392e068d39be6c14fad26c7f316c01
diff --git a/metadata/md5-cache/dev-perl/App-Nopaste-1.12.0 b/metadata/md5-cache/dev-perl/App-Nopaste-1.12.0
index dabfa5030829..be6699b6a93b 100644
--- a/metadata/md5-cache/dev-perl/App-Nopaste-1.12.0
+++ b/metadata/md5-cache/dev-perl/App-Nopaste-1.12.0
@@ -7,7 +7,8 @@ IUSE=+pastebin +browser clipboard gitlab test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Load virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/Getopt-Long-Descriptive dev-perl/JSON-MaybeXS dev-perl/libwww-perl dev-perl/Module-Pluggable dev-perl/Module-Runtime dev-perl/Path-Tiny dev-perl/URI dev-perl/WWW-Mechanize >=dev-perl/namespace-clean-0.190.0 pastebin? ( >=dev-perl/WWW-Pastebin-PastebinCom-Create-1.3.0 ) clipboard? ( dev-perl/Clipboard ) gitlab? ( dev-vcs/git ) browser? ( dev-perl/Browser-Open ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/App-Nopaste-1.012.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bdab06f643e27615239b8fe5af975b99
+_md5_=b0ca3c216dc2f2d9f439408ba4402e91
diff --git a/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400 b/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400
index 27b272f902bc..ab1b9dd37de1 100644
--- a/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400
+++ b/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bde930e2715d3503c299e9b38e116a67
+_md5_=b7aa9ffb3fbc2cd41f95d6f0d0b1d4fd
diff --git a/metadata/md5-cache/dev-perl/App-perlbrew-0.820.0 b/metadata/md5-cache/dev-perl/App-perlbrew-0.820.0
index 48676478c61e..c9c4888daa1d 100644
--- a/metadata/md5-cache/dev-perl/App-perlbrew-0.820.0
+++ b/metadata/md5-cache/dev-perl/App-perlbrew-0.820.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-perl/CPAN-Perl-Releases-3.240.0 >=dev-perl/Capture-Tiny-0.360.0 >=dev-perl/Devel-PatchPerl-1.400.0 >=virtual/perl-Pod-Parser-1.630.0 >=dev-perl/local-lib-2.0.14 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.82.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bc9975b5361c875f23f1e22b2c961130
+_md5_=734b673f560fbc1fc32297584621a8cb
diff --git a/metadata/md5-cache/dev-perl/App-perlbrew-0.840.0 b/metadata/md5-cache/dev-perl/App-perlbrew-0.840.0
index 8a2dd11e142b..f12142d3a9c0 100644
--- a/metadata/md5-cache/dev-perl/App-perlbrew-0.840.0
+++ b/metadata/md5-cache/dev-perl/App-perlbrew-0.840.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.860.0 >=dev-perl/CPAN-Perl-Releases-3.660.0 >=dev-perl/Capture-Tiny-0.360.0 >=dev-perl/Devel-PatchPerl-1.520.0 >=virtual/perl-File-Temp-0.230.400 virtual/perl-JSON-PP >=virtual/perl-Pod-Parser-1.630.0 >=dev-perl/local-lib-2.0.14 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.84.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c2cbfc1ffda191e35aec1d14e82e0c13
+_md5_=d0cc1dcff1b0dd8d22907d53806f512b
diff --git a/metadata/md5-cache/dev-perl/App-pwhich-1.140.0 b/metadata/md5-cache/dev-perl/App-pwhich-1.140.0
index 0179043ef1db..79a409cb8c2a 100644
--- a/metadata/md5-cache/dev-perl/App-pwhich-1.140.0
+++ b/metadata/md5-cache/dev-perl/App-pwhich-1.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Which-1.140.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/App-pwhich-1.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fb7b5381d767da156de86d3c549ad8d3
+_md5_=befd5354770feeaa8528ae23cff9a2e0
diff --git a/metadata/md5-cache/dev-perl/App-pwhich-1.150.0 b/metadata/md5-cache/dev-perl/App-pwhich-1.150.0
index 924408711071..5d9c121fd2e4 100644
--- a/metadata/md5-cache/dev-perl/App-pwhich-1.150.0
+++ b/metadata/md5-cache/dev-perl/App-pwhich-1.150.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Which-1.140.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/App-pwhich-1.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c04f93595b8dea7f868a11691e44dd6d
+_md5_=237eca66a4298f47eafaafea4280c787
diff --git a/metadata/md5-cache/dev-perl/AppConfig-1.710.0 b/metadata/md5-cache/dev-perl/AppConfig-1.710.0
index 6364cebc0fc7..01d723b0c3fa 100644
--- a/metadata/md5-cache/dev-perl/AppConfig-1.710.0
+++ b/metadata/md5-cache/dev-perl/AppConfig-1.710.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-HomeDir-0.57 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/AppConfig-1.71.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f7744f12a77f8f366b9574eeb0babcf7
+_md5_=a8fb060b2deffe9f793b7031066241eb
diff --git a/metadata/md5-cache/dev-perl/Archive-Any-0.94.500 b/metadata/md5-cache/dev-perl/Archive-Any-0.94.500
index 49c01a015601..cbb867211ecc 100644
--- a/metadata/md5-cache/dev-perl/Archive-Any-0.94.500
+++ b/metadata/md5-cache/dev-perl/Archive-Any-0.94.500
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Archive-Tar dev-perl/Archive-Zip dev-perl/Module-Find dev-perl/MIME-Types dev-perl/File-MMagic virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/Archive-Any-0.0945.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1ad7e6e31ad811b65004e0745412ffaa
+_md5_=c951810d7843dfb2eca8ce1a59fffbbc
diff --git a/metadata/md5-cache/dev-perl/Archive-Extract-0.800.0 b/metadata/md5-cache/dev-perl/Archive-Extract-0.800.0
index 9a69ad2208a6..bb6583da7492 100644
--- a/metadata/md5-cache/dev-perl/Archive-Extract-0.800.0
+++ b/metadata/md5-cache/dev-perl/Archive-Extract-0.800.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-IPC-Cmd virtual/perl-Locale-Maketext-Simple virtual/perl-Module-Load-Conditional virtual/perl-Params-Check virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.80.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e1c80c18ff19b0d4cc0f4f07c308a3c1
+_md5_=96485782f62731986e0a41b681f0d2a5
diff --git a/metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.230.0 b/metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.230.0
index ceaa4004eac7..4f188bb782bb 100644
--- a/metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.230.0
+++ b/metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.230.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which dev-perl/IPC-Run dev-perl/Log-Log4perl virtual/perl-File-Path app-arch/tar dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/Archive-Tar-Wrapper-0.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=94fce6c8c0b19f1beb1c6dbc77ff74e0
+_md5_=7303b9368ea6c281e52516e25d7a7d1a
diff --git a/metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.330.0 b/metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.330.0
index 1045e429d17a..b31262fcd232 100644
--- a/metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.330.0
+++ b/metadata/md5-cache/dev-perl/Archive-Tar-Wrapper-0.330.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which dev-perl/IPC-Run dev-perl/Log-Log4perl virtual/perl-File-Path app-arch/tar dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.33.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=951e906c42d63c112296305c8896eff0
+_md5_=1493fe363bb5a3fefb4bfe864c4ebf30
diff --git a/metadata/md5-cache/dev-perl/Archive-Zip-1.640.0 b/metadata/md5-cache/dev-perl/Archive-Zip-1.640.0
index 06ec02ee63a0..86d831ea6c56 100644
--- a/metadata/md5-cache/dev-perl/Archive-Zip-1.640.0
+++ b/metadata/md5-cache/dev-perl/Archive-Zip-1.640.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Compress-Raw-Zlib-2.17.0 virtual/perl-Encode virtual/perl-File-Path >=virtual/perl-File-Spec-0.800.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-Local dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.64.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6f215ca81346fd6473b56cc267f5ec82
+_md5_=57a560f74ca4427d4d4dee117c4767d8
diff --git a/metadata/md5-cache/dev-perl/Array-Compare-3.0.1 b/metadata/md5-cache/dev-perl/Array-Compare-3.0.1
index bc5aeabc9f6c..47ca82c1368f 100644
--- a/metadata/md5-cache/dev-perl/Array-Compare-3.0.1
+++ b/metadata/md5-cache/dev-perl/Array-Compare-3.0.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Moo dev-perl/Type-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=855123356213776ff89520c36d61480e
+_md5_=647f18b7ab3e009a11cfa1be4731681e
diff --git a/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1 b/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1
index dfd4c9921699..f47fb2d93437 100644
--- a/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ~ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Params-Util dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Array-Window-1.02.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bc00cd9f826932e57c952c03238330ba
+_md5_=bb45ee84f3ea74c5376137e6c508439d
diff --git a/metadata/md5-cache/dev-perl/AtExit-2.30.0 b/metadata/md5-cache/dev-perl/AtExit-2.30.0
index 968437fd923d..1e23f1a5dfb1 100644
--- a/metadata/md5-cache/dev-perl/AtExit-2.30.0
+++ b/metadata/md5-cache/dev-perl/AtExit-2.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ppc sparc x86
 LICENSE=|| ( Artistic Artistic-2 )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/AtExit-2.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ed7ea553b47472d3859df5d65654874d
+_md5_=2e9ae8e025def5511c7d149c95c46af3
diff --git a/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r1 b/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r1
index 706eea17598f..1fec878468b9 100644
--- a/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Audio-FLAC-Header-2.400.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=media-libs/flac dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Audio-FLAC-Header-2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91063ff901b7581951cb285446a9d730
+_md5_=2d552bead3f1cacda04c8b96a434d59e
diff --git a/metadata/md5-cache/dev-perl/Audio-Scan-1.0.0 b/metadata/md5-cache/dev-perl/Audio-Scan-1.0.0
index f321e320b540..f304070e18fb 100644
--- a/metadata/md5-cache/dev-perl/Audio-Scan-1.0.0
+++ b/metadata/md5-cache/dev-perl/Audio-Scan-1.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AG/AGRUNDMA/Audio-Scan-1.00.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d6d3cc079b9be84c64efac0baed2e9d9
+_md5_=87212b3c50c1b7b51896227fc094f78b
diff --git a/metadata/md5-cache/dev-perl/Audio-Scan-1.10.0 b/metadata/md5-cache/dev-perl/Audio-Scan-1.10.0
index 651fbf58a00e..72917cfe61be 100644
--- a/metadata/md5-cache/dev-perl/Audio-Scan-1.10.0
+++ b/metadata/md5-cache/dev-perl/Audio-Scan-1.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AG/AGRUNDMA/Audio-Scan-1.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e7b6d93e6edc9c377fae50d0c902cb40
+_md5_=47fdee69ffa95d6c8148a393f2a811bc
diff --git a/metadata/md5-cache/dev-perl/Audio-WMA-1.300.0 b/metadata/md5-cache/dev-perl/Audio-WMA-1.300.0
index 15ed93884a9e..832ff6e77bb0 100644
--- a/metadata/md5-cache/dev-perl/Audio-WMA-1.300.0
+++ b/metadata/md5-cache/dev-perl/Audio-WMA-1.300.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Audio-WMA-1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=207867cfda4b54e4fa60d264b95115cb
+_md5_=645598e25eac716b854de08e391ffe7a
diff --git a/metadata/md5-cache/dev-perl/Authen-Libwrap-0.230.0 b/metadata/md5-cache/dev-perl/Authen-Libwrap-0.230.0
index 629285503b65..bde02bb8cbaf 100644
--- a/metadata/md5-cache/dev-perl/Authen-Libwrap-0.230.0
+++ b/metadata/md5-cache/dev-perl/Authen-Libwrap-0.230.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-apps/tcp-wrappers dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMUEY/Authen-Libwrap-0.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=69650654a465fb92500cdcf7d93db1b2
+_md5_=1d0aa5ec20b046086a44e702e7c3a1b3
diff --git a/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1 b/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1
index c3a231f8788b..91f9cb6d4049 100644
--- a/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-NTLM-1.90.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-3.00 dev-perl/Digest-HMAC dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NB/NBEBOUT/NTLM-1.09.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0e2a29aade2cabc228bb520d0b6f0022
+_md5_=5c9077274b149585f065d93e2996bf6d
diff --git a/metadata/md5-cache/dev-perl/Authen-Radius-0.260.0 b/metadata/md5-cache/dev-perl/Authen-Radius-0.260.0
index 0deb337fdf6d..28d3e3eb83a9 100644
--- a/metadata/md5-cache/dev-perl/Authen-Radius-0.260.0
+++ b/metadata/md5-cache/dev-perl/Authen-Radius-0.260.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~hppa ~sparc x86
 LICENSE=Artistic-2
 RDEPEND=>=virtual/perl-Data-Dumper-1.0.0 >=dev-perl/Data-HexDump-0.20.0 >=virtual/perl-Digest-MD5-2.200.0 >=virtual/perl-IO-1.120.0 >=dev-perl/Net-IP-1.260.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9a5ce96ded0c29b4789a2309a843f8c6
+_md5_=c2dafa42ed2be4c4c6561109c6a10e8d
diff --git a/metadata/md5-cache/dev-perl/Authen-Radius-0.270.0 b/metadata/md5-cache/dev-perl/Authen-Radius-0.270.0
index aa4887c76663..fc07c11adae6 100644
--- a/metadata/md5-cache/dev-perl/Authen-Radius-0.270.0
+++ b/metadata/md5-cache/dev-perl/Authen-Radius-0.270.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ~hppa ~sparc x86
 LICENSE=Artistic-2
 RDEPEND=>=virtual/perl-Data-Dumper-1.0.0 >=dev-perl/Data-HexDump-0.20.0 >=virtual/perl-Digest-MD5-2.200.0 >=virtual/perl-IO-1.120.0 >=dev-perl/Net-IP-1.260.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=be176ad55797ef794b2f44e2c536691c
+_md5_=3f3744fd491378cc45a0a468dad0f388
diff --git a/metadata/md5-cache/dev-perl/Authen-SASL-SASLprep-1.100.0 b/metadata/md5-cache/dev-perl/Authen-SASL-SASLprep-1.100.0
index 0df17c099f8f..1550846762ee 100644
--- a/metadata/md5-cache/dev-perl/Authen-SASL-SASLprep-1.100.0
+++ b/metadata/md5-cache/dev-perl/Authen-SASL-SASLprep-1.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Unicode-Stringprep-1 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Authen-SASL-SASLprep-1.100.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5e99e4868493c1c127f95856dfbf6d67
+_md5_=91a636223ac0512e0d74cc2d195e533b
diff --git a/metadata/md5-cache/dev-perl/Authen-SCRAM-0.11.0 b/metadata/md5-cache/dev-perl/Authen-SCRAM-0.11.0
index 3af072ded48b..7262b4a2b31b 100644
--- a/metadata/md5-cache/dev-perl/Authen-SCRAM-0.11.0
+++ b/metadata/md5-cache/dev-perl/Authen-SCRAM-0.11.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Authen-SASL-SASLprep virtual/perl-Carp dev-perl/Crypt-URandom virtual/perl-Encode virtual/perl-MIME-Base64 >=dev-perl/Moo-1.1.0 >=dev-perl/PBKDF2-Tiny-0.3.0 dev-perl/Try-Tiny dev-perl/Type-Tiny dev-perl/namespace-clean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Authen-SCRAM-0.011.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8d685f6b31ea3471d66151f325bc73a3
+_md5_=b4ec466c50bcf59babba294faefcc787
diff --git a/metadata/md5-cache/dev-perl/Authen-SCRAM-0.9.0 b/metadata/md5-cache/dev-perl/Authen-SCRAM-0.9.0
index aac9b64f5ec1..d09fefbe9c74 100644
--- a/metadata/md5-cache/dev-perl/Authen-SCRAM-0.9.0
+++ b/metadata/md5-cache/dev-perl/Authen-SCRAM-0.9.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Authen-SASL-SASLprep virtual/perl-Carp dev-perl/Crypt-URandom virtual/perl-Encode virtual/perl-MIME-Base64 >=dev-perl/Moo-1.1.0 >=dev-perl/PBKDF2-Tiny-0.3.0 dev-perl/Try-Tiny dev-perl/Type-Tiny dev-perl/namespace-clean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Authen-SCRAM-0.009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a0bd9252e8dac1f215943e1d21036a43
+_md5_=a2e8a0678df26f717407baa341d66afc
diff --git a/metadata/md5-cache/dev-perl/Authen-Simple-0.500.0 b/metadata/md5-cache/dev-perl/Authen-Simple-0.500.0
index 3f2cd96d989e..0c4591fa906d 100644
--- a/metadata/md5-cache/dev-perl/Authen-Simple-0.500.0
+++ b/metadata/md5-cache/dev-perl/Authen-Simple-0.500.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-perl/Crypt-PasswdMD5 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-MIME-Base64 dev-perl/Params-Validate dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-0.5.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9084de3f74a397555f49c6ddbb2d68e8
+_md5_=4ba4c15105caf2b49cf67de84afe708c
diff --git a/metadata/md5-cache/dev-perl/B-Debug-1.260.0 b/metadata/md5-cache/dev-perl/B-Debug-1.260.0
index 6e311403a257..8f8514d3df0d 100644
--- a/metadata/md5-cache/dev-perl/B-Debug-1.260.0
+++ b/metadata/md5-cache/dev-perl/B-Debug-1.260.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/B-Flags-0.40.0 ) >=dev-lang/perl-5.19.2 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/B-Debug-1.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a490326eec69af208ebf1a5bfefcc79c
+_md5_=60f53878b044a17b0f2b1f20563fc943
diff --git a/metadata/md5-cache/dev-perl/B-Flags-0.170.0 b/metadata/md5-cache/dev-perl/B-Flags-0.170.0
index 35bee92557dd..84ea2f6020a3 100644
--- a/metadata/md5-cache/dev-perl/B-Flags-0.170.0
+++ b/metadata/md5-cache/dev-perl/B-Flags-0.170.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/B-Flags-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fcf39954c09a3efa6c07b45adc14328b
+_md5_=f9e76a5e6fe3d392078056e6a8552d51
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0 b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0
index ed7472cb28d1..4697a1761e27 100644
--- a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0
+++ b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Module-Implementation-0.50.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-Progressive-0.1.6 >=dev-perl/Variable-Magic-0.480.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b4be49fc89ccb2bffc11b4fb8f59c45b
+_md5_=2ea24eb217d358ea3d88a8e0497c1d2f
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0 b/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0
index 81d61984c516..2c4127201ff4 100644
--- a/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0
+++ b/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-OP-Check-0.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=31fd7c322718b12157cf6c13439d2643
+_md5_=e992e90101774fac9b4f812cbcbb6cfc
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-Parser-0.190.0 b/metadata/md5-cache/dev-perl/B-Hooks-Parser-0.190.0
index e33157cdc8c9..7634f07b3f4a 100644
--- a/metadata/md5-cache/dev-perl/B-Hooks-Parser-0.190.0
+++ b/metadata/md5-cache/dev-perl/B-Hooks-Parser-0.190.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-OP-Check-0.180.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-Parser-0.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0c2835861202c012737e60e41e8a7454
+_md5_=ef303305f03ce9a7f20101821af7979f
diff --git a/metadata/md5-cache/dev-perl/B-OPCheck-0.320.0 b/metadata/md5-cache/dev-perl/B-OPCheck-0.320.0
index 1bd119dcf616..70e65efde405 100644
--- a/metadata/md5-cache/dev-perl/B-OPCheck-0.320.0
+++ b/metadata/md5-cache/dev-perl/B-OPCheck-0.320.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Utils-0.80.0 virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-perl/Scope-Guard virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-OPCheck-0.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fe710bfa7ca6e31d4c71f764396cbe4a
+_md5_=419abfa8c1f45f3241acc92d74f9106a
diff --git a/metadata/md5-cache/dev-perl/B-Utils-0.270.0 b/metadata/md5-cache/dev-perl/B-Utils-0.270.0
index 830f68d775b4..5020bffe3026 100644
--- a/metadata/md5-cache/dev-perl/B-Utils-0.270.0
+++ b/metadata/md5-cache/dev-perl/B-Utils-0.270.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a95d7711418560034e821c2954bc0d9
+_md5_=0d70d2299e4fa7bf1ed9a1b4cabcde84
diff --git a/metadata/md5-cache/dev-perl/BSON-1.10.2 b/metadata/md5-cache/dev-perl/BSON-1.10.2
index 9f5665bd03a4..035330b0682b 100644
--- a/metadata/md5-cache/dev-perl/BSON-1.10.2
+++ b/metadata/md5-cache/dev-perl/BSON-1.10.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp dev-perl/Crypt-URandom virtual/perl-Exporter virtual/perl-MIME-Base64 virtual/perl-Math-BigInt >=dev-perl/Moo-2.2.4 virtual/perl-Scalar-List-Utils dev-perl/Tie-IxHash virtual/perl-Time-HiRes virtual/perl-Time-Local >=dev-perl/boolean-0.450.0 virtual/perl-if dev-perl/namespace-clean virtual/perl-threads-shared virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MO/MONGODB/BSON-v1.10.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cf3a0ca464318ab7ca49c2c81440d654
+_md5_=edaa97c7ab734cfc12f0edc6b53999a5
diff --git a/metadata/md5-cache/dev-perl/BSON-1.6.7 b/metadata/md5-cache/dev-perl/BSON-1.6.7
index 70156783d1c1..be96e8f80964 100644
--- a/metadata/md5-cache/dev-perl/BSON-1.6.7
+++ b/metadata/md5-cache/dev-perl/BSON-1.6.7
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-MIME-Base64 virtual/perl-Math-BigInt >=dev-perl/Moo-2.2.4 virtual/perl-Scalar-List-Utils dev-perl/Tie-IxHash virtual/perl-Time-HiRes virtual/perl-Time-Local >=dev-perl/boolean-0.450.0 virtual/perl-if dev-perl/namespace-clean virtual/perl-threads-shared virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MO/MONGODB/BSON-v1.6.7.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=455b6f44af8d29fbc8b0455320ab6d87
+_md5_=cf21ad8de7f148c9557583d7d9cf9cc0
diff --git a/metadata/md5-cache/dev-perl/BZ-Client-4.400.200 b/metadata/md5-cache/dev-perl/BZ-Client-4.400.200
index 97047b0d356d..41dd6511eeda 100644
--- a/metadata/md5-cache/dev-perl/BZ-Client-4.400.200
+++ b/metadata/md5-cache/dev-perl/BZ-Client-4.400.200
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime-Format-ISO8601 dev-perl/DateTime-Format-Strptime dev-perl/DateTime-TimeZone virtual/perl-Encode virtual/perl-File-Spec dev-perl/HTTP-CookieJar virtual/perl-HTTP-Tiny virtual/perl-MIME-Base64 dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Writer virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DJ/DJZORT/BZ-Client-4.4002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d78975e69d3cb6049e840e1188305b9e
+_md5_=13189fc6195d56c62a327c986ecbf7da
diff --git a/metadata/md5-cache/dev-perl/Benchmark-Timer-0.710.700 b/metadata/md5-cache/dev-perl/Benchmark-Timer-0.710.700
index 8a1a240585ff..44de63c74abf 100644
--- a/metadata/md5-cache/dev-perl/Benchmark-Timer-0.710.700
+++ b/metadata/md5-cache/dev-perl/Benchmark-Timer-0.710.700
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Statistics-TTest virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/Benchmark-Timer-0.7107.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=078fa7d618df377b07f581bda5af5266
+_md5_=0a62bfe067e5449f1d969916803e90b8
diff --git a/metadata/md5-cache/dev-perl/Benchmark-Timer-0.711.200 b/metadata/md5-cache/dev-perl/Benchmark-Timer-0.711.200
index 3c45dfda574e..7f6b5b1d83d3 100644
--- a/metadata/md5-cache/dev-perl/Benchmark-Timer-0.711.200
+++ b/metadata/md5-cache/dev-perl/Benchmark-Timer-0.711.200
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Statistics-TTest virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/Benchmark-Timer-0.7112.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6e2dfb184e05032a1872d6de802eab38
+_md5_=86e893ac0ada99c1adaa811defa92eec
diff --git a/metadata/md5-cache/dev-perl/Bio-ASN1-EntrezGene-1.720.0 b/metadata/md5-cache/dev-perl/Bio-ASN1-EntrezGene-1.720.0
index f323f0a49afe..9777e973b699 100644
--- a/metadata/md5-cache/dev-perl/Bio-ASN1-EntrezGene-1.720.0
+++ b/metadata/md5-cache/dev-perl/Bio-ASN1-EntrezGene-1.720.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-parent >=sci-biology/bioperl-1.6.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/Bio-ASN1-EntrezGene-1.72.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ff0cab3c2f38d4033cec6527813798fc
+_md5_=a592204af34e679dba6e4abaf5bf479a
diff --git a/metadata/md5-cache/dev-perl/Browser-Open-0.40.0 b/metadata/md5-cache/dev-perl/Browser-Open-0.40.0
index 7676a92259a1..ea57f3ecc19d 100644
--- a/metadata/md5-cache/dev-perl/Browser-Open-0.40.0
+++ b/metadata/md5-cache/dev-perl/Browser-Open-0.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFRANKS/Browser-Open-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=508da84f27c8bc0637f3cafab9f186bb
+_md5_=a7e4e7f142a5aba9e56fe3df5d96dc81
diff --git a/metadata/md5-cache/dev-perl/Business-ISBN-3.4.0 b/metadata/md5-cache/dev-perl/Business-ISBN-3.4.0
index 201f5182b3e3..e21a00dcd42c 100644
--- a/metadata/md5-cache/dev-perl/Business-ISBN-3.4.0
+++ b/metadata/md5-cache/dev-perl/Business-ISBN-3.4.0
@@ -7,7 +7,8 @@ IUSE=test barcode examples
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Artistic-2
 RDEPEND=barcode? ( dev-perl/GD-Barcode dev-perl/GD[png] ) >=dev-perl/Business-ISBN-Data-20140910.2.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-3.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=00484c24d235846ca20b71c471646a66
+_md5_=137c55897c8a216bedc49ac2715e9f19
diff --git a/metadata/md5-cache/dev-perl/Business-ISBN-Data-20140910.3.0 b/metadata/md5-cache/dev-perl/Business-ISBN-Data-20140910.3.0
index f698bc6fb93f..a65b34b2a25e 100644
--- a/metadata/md5-cache/dev-perl/Business-ISBN-Data-20140910.3.0
+++ b/metadata/md5-cache/dev-perl/Business-ISBN-Data-20140910.3.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20140910.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=87a86ee5a886a7aa16b5e5a43e4d005b
+_md5_=d6c01a8d1253fed86dccd4b46836e5e7
diff --git a/metadata/md5-cache/dev-perl/Business-ISMN-1.131.0 b/metadata/md5-cache/dev-perl/Business-ISMN-1.131.0
index a2231814859d..2c51f87ca9a2 100644
--- a/metadata/md5-cache/dev-perl/Business-ISMN-1.131.0
+++ b/metadata/md5-cache/dev-perl/Business-ISMN-1.131.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Tie-Cycle-1.210.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.131.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b2363fbbad6953de324706bfdb9f194a
+_md5_=b881601fb07ae3a96580d4d8dff8bfcf
diff --git a/metadata/md5-cache/dev-perl/Business-ISMN-1.132.0 b/metadata/md5-cache/dev-perl/Business-ISMN-1.132.0
index 5771c89e35ac..c963d014bf2c 100644
--- a/metadata/md5-cache/dev-perl/Business-ISMN-1.132.0
+++ b/metadata/md5-cache/dev-perl/Business-ISMN-1.132.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Tie-Cycle-1.210.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.132.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9b0064356065d17c8604cc46f04a1be5
+_md5_=dab2e72a8b1fc16e839960e03ce3997a
diff --git a/metadata/md5-cache/dev-perl/Business-ISSN-1.2.0 b/metadata/md5-cache/dev-perl/Business-ISSN-1.2.0
index f36a50c22207..a60252ad2066 100644
--- a/metadata/md5-cache/dev-perl/Business-ISSN-1.2.0
+++ b/metadata/md5-cache/dev-perl/Business-ISSN-1.2.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=32b29748d3fee236860c621b1eed1b62
+_md5_=0a95e54988a960ff62578c8d62fecf1f
diff --git a/metadata/md5-cache/dev-perl/Business-ISSN-1.3.0 b/metadata/md5-cache/dev-perl/Business-ISSN-1.3.0
index 9610acf4d453..0eb2c565c34c 100644
--- a/metadata/md5-cache/dev-perl/Business-ISSN-1.3.0
+++ b/metadata/md5-cache/dev-perl/Business-ISSN-1.3.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8ae0319adcc0e5d8a3253384893f83de
+_md5_=24918dad8ff3b5b406a8fb705a9258e4
diff --git a/metadata/md5-cache/dev-perl/CBOR-XS-1.700.0 b/metadata/md5-cache/dev-perl/CBOR-XS-1.700.0
index c4ba298d92f6..9db0fb7bfee1 100644
--- a/metadata/md5-cache/dev-perl/CBOR-XS-1.700.0
+++ b/metadata/md5-cache/dev-perl/CBOR-XS-1.700.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=dev-perl/Types-Serialiser dev-perl/common-sense dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/CBOR-XS-1.7.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=681f6622dd05483e80d11bb42e537516
+_md5_=81cede22c2ddeff181dfd032b2542324
diff --git a/metadata/md5-cache/dev-perl/CDB_File-0.990.0 b/metadata/md5-cache/dev-perl/CDB_File-0.990.0
index 711488c29296..2f797605778d 100644
--- a/metadata/md5-cache/dev-perl/CDB_File-0.990.0
+++ b/metadata/md5-cache/dev-perl/CDB_File-0.990.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/CDB_File-0.99.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9fa4a567ff11c9dbd34e80cbd4a7eece
+_md5_=df71c809a95f4b9e9cadced458c82d32
diff --git a/metadata/md5-cache/dev-perl/CDDB-1.222.0-r2 b/metadata/md5-cache/dev-perl/CDDB-1.222.0-r2
index b1a2fa8dd66c..2fd41d5937a5 100644
--- a/metadata/md5-cache/dev-perl/CDDB-1.222.0-r2
+++ b/metadata/md5-cache/dev-perl/CDDB-1.222.0-r2
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Carp-1.260.0 >=virtual/perl-Encode-2.510.0 >=virtual/perl-IO-1.310.0 >=virtual/perl-MIME-Base64-3.130.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/CDDB-1.222.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2977e3d3e67ffeb2df808c1470b24502
+_md5_=8d7f798edda7bf0fa55670bca05f7627
diff --git a/metadata/md5-cache/dev-perl/CGI-4.220.0 b/metadata/md5-cache/dev-perl/CGI-4.220.0
index b579c6738cae..49811636acaa 100644
--- a/metadata/md5-cache/dev-perl/CGI-4.220.0
+++ b/metadata/md5-cache/dev-perl/CGI-4.220.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 virtual/perl-File-Temp >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.22.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0d2e76195adbcea4a5471811e994a795
+_md5_=84330472739a67694e69d3546d0e52af
diff --git a/metadata/md5-cache/dev-perl/CGI-4.400.0 b/metadata/md5-cache/dev-perl/CGI-4.400.0
index c01febe8a6d6..5e3195ab7c52 100644
--- a/metadata/md5-cache/dev-perl/CGI-4.400.0
+++ b/metadata/md5-cache/dev-perl/CGI-4.400.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-File-Temp-0.170.0 >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.40.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1c3ab80c428130b0c940bdc87bdbb795
+_md5_=d98e521872324cf7e4acd98b88dc57ac
diff --git a/metadata/md5-cache/dev-perl/CGI-Ajax-0.707.0 b/metadata/md5-cache/dev-perl/CGI-Ajax-0.707.0
index 461e206e9770..d11df49de423 100644
--- a/metadata/md5-cache/dev-perl/CGI-Ajax-0.707.0
+++ b/metadata/md5-cache/dev-perl/CGI-Ajax-0.707.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/CGI dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPEDERSE/CGI-Ajax-0.707.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3210a28d530b7aa4475c2ab943574d59
+_md5_=a8b59317077cc44209ba800f28d8da16
diff --git a/metadata/md5-cache/dev-perl/CGI-Compile-0.220.0 b/metadata/md5-cache/dev-perl/CGI-Compile-0.220.0
index 0ac6ce78a511..2344a07c9948 100644
--- a/metadata/md5-cache/dev-perl/CGI-Compile-0.220.0
+++ b/metadata/md5-cache/dev-perl/CGI-Compile-0.220.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-pushd dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-Compile-0.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=32797bf5c55a29470de68c44c9166684
+_md5_=ce301a3ede71571becf6cecbc5214553
diff --git a/metadata/md5-cache/dev-perl/CGI-Emulate-PSGI-0.230.0 b/metadata/md5-cache/dev-perl/CGI-Emulate-PSGI-0.230.0
index c4c5afb6a62a..c3ac4a2267d3 100644
--- a/metadata/md5-cache/dev-perl/CGI-Emulate-PSGI-0.230.0
+++ b/metadata/md5-cache/dev-perl/CGI-Emulate-PSGI-0.230.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CGI-3.630.0 dev-perl/HTTP-Message dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/CGI-Emulate-PSGI-0.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f6ca4503176bf1e01f851291dc4bf520
+_md5_=8e0440c95d8fa782f80111edcd845aa9
diff --git a/metadata/md5-cache/dev-perl/CGI-Fast-2.130.0 b/metadata/md5-cache/dev-perl/CGI-Fast-2.130.0
index de3ac3fac566..a6fce03f5d97 100644
--- a/metadata/md5-cache/dev-perl/CGI-Fast-2.130.0
+++ b/metadata/md5-cache/dev-perl/CGI-Fast-2.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~hppa ~m68k ~mips ppc ~ppc64 ~s390 ~sh x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CGI-4 virtual/perl-Carp >=dev-perl/FCGI-0.670.0 virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dbf3d5d168f8c075aaa2dc2e3d2847ac
+_md5_=2747fb2d3117d09e8095cf403e58a851
diff --git a/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0 b/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0
index a635fffa3807..816dc5921441 100644
--- a/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0
+++ b/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/CGI dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BIGPRESH/CGI-FormBuilder-3.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=800f862a1c4d458c0e5cde5dbb2a8cf0
+_md5_=f525f2424719140b68f75539bd78a736
diff --git a/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1 b/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1
index d7e01a46ccbc..15d5b9090aea 100644
--- a/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CGI-3.330.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-PSGI-0.15.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=546a338ff1f865b5a0b81514ff3cdf6a
+_md5_=18265994ee2800a15eb77a7fbed4797b
diff --git a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1 b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1
index d31444a29d1e..622c6c32d2db 100644
--- a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1
+++ b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=dev-perl/CGI-3.26 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=48c1c57a99ec0d807985438757c22173
+_md5_=cf3a54862b1576dbcbc3a71e951470ec
diff --git a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2 b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2
index 8845b0796cef..369999812366 100644
--- a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2
+++ b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=dev-perl/CGI-3.26 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=81dd725ce1815d775961098d426ebd8c
+_md5_=27daeb6b263390784ea4aa48e86c331b
diff --git a/metadata/md5-cache/dev-perl/CGI-Simple-1.115.0 b/metadata/md5-cache/dev-perl/CGI-Simple-1.115.0
index cdf5a0fe8047..dfa98536daa6 100644
--- a/metadata/md5-cache/dev-perl/CGI-Simple-1.115.0
+++ b/metadata/md5-cache/dev-perl/CGI-Simple-1.115.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZABGAB/CGI-Simple-1.115.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7cc5f479ea6cb483cf536e5c6c081649
+_md5_=a1e91c229aafce650e07c9510bf01e1e
diff --git a/metadata/md5-cache/dev-perl/CHI-0.600.0 b/metadata/md5-cache/dev-perl/CHI-0.600.0
index 6992a4496a5c..a40773330469 100644
--- a/metadata/md5-cache/dev-perl/CHI-0.600.0
+++ b/metadata/md5-cache/dev-perl/CHI-0.600.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Carp-Assert-0.200.0 dev-perl/Class-Load dev-perl/Data-UUID dev-perl/Digest-JHash virtual/perl-Digest-MD5 >=virtual/perl-File-Spec-0.800.0 dev-perl/Hash-MoreUtils >=dev-perl/JSON-MaybeXS-1.3.3 >=dev-perl/List-MoreUtils-0.130.0 >=dev-perl/Log-Any-0.80.0 >=dev-perl/Moo-1.3.0 >=dev-perl/MooX-Types-MooseLike-0.230.0 dev-perl/MooX-Types-MooseLike-Numeric virtual/perl-Storable dev-perl/String-RewritePrefix dev-perl/Task-Weaken >=dev-perl/Time-Duration-1.60.0 >=dev-perl/Time-Duration-Parse-0.30.0 virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.50.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSWARTZ/CHI-0.60.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2509413006aaee24bcdce23b73db00b3
+_md5_=4ac6483aa309bed88b70239d9e0df7ef
diff --git a/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2 b/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
index 555665b7a5cf..f6776ceaef00 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
+++ b/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Text-Tabs+Wrap-0.3.0 >=virtual/perl-version-0.990.600 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/CPAN-Changes-0.400002.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a3d06c8c98a4fce63758f74994a9c21c
+_md5_=59d0f981557611abc0106de0d6dd3a10
diff --git a/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0 b/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0
index c45d0e5015a4..8f0219c8d4da 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0
+++ b/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Compress-Bzip2 dev-perl/Data-Compare virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.360.0 virtual/perl-Digest-SHA virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-IO virtual/perl-IO-Compress virtual/perl-Safe dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7127f64d75ba2ad683cc4b1da6f45fbb
+_md5_=9076981b0e08dc1474eb4f38ecf33ee5
diff --git a/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r2 b/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r2
index 43e2411eaecf..f1a672fb6ad3 100644
--- a/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r2
+++ b/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=668d05949682e13eb4b1e4432f5e368a
+_md5_=e9d32a111217f4b4ef794cbc758a0c93
diff --git a/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0 b/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0
index 8dcca45edb6b..1712d2c3f88f 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0
+++ b/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-2.132.830 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 virtual/perl-Exporter >=virtual/perl-Module-Metadata-1.0.23 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=71ccedb1d0006b630651f07660a38486
+_md5_=d5cb82bed7802f1404decde3f48209b6
diff --git a/metadata/md5-cache/dev-perl/CPAN-Mini-1.111.16 b/metadata/md5-cache/dev-perl/CPAN-Mini-1.111.16
index abee604eead4..5e46f9e423f2 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Mini-1.111.16
+++ b/metadata/md5-cache/dev-perl/CPAN-Mini-1.111.16
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/File-HomeDir-0.570.0 >=virtual/perl-File-Path-2.40.0 virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long >=virtual/perl-IO-Compress-1.20 >=dev-perl/libwww-perl-5 >=dev-perl/URI-1 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111016.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f11f3615ea6170c93db24dd0437b9f75
+_md5_=8a26d89308cb150ff04007545a062a29
diff --git a/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.350.0 b/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.350.0
index 3d84d0555cb9..c555ef64a9d4 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.350.0
+++ b/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.350.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/CPAN-Checksums >=dev-perl/CPAN-Mini-0.320.0 virtual/perl-Carp >=dev-perl/Dist-Metadata-0.921.0 >=virtual/perl-File-Path-2.70.0 dev-perl/File-Slurp >=virtual/perl-File-Spec-2.70.0 virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/perl-IO-Zlib dev-perl/libwww-perl dev-perl/YAML dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/CPAN-Mini-Inject-0.35.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fe27b20239fe59ffc9c3d82862ec29fb
+_md5_=92b31e1acef23b05c21715d471ec0bd7
diff --git a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.760.0 b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.760.0
index 948d7fccf0d2..14c08902811d 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.760.0
+++ b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.760.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-3.76.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=db490157ca572d213a20cff7b416b6a2
+_md5_=58678d65977d2856c1bd00eb26722043
diff --git a/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.13 b/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.13
index 86b83ba16e70..579a9efebe62 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.13
+++ b/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.13
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/HTTP-Message >=dev-perl/LWP-Protocol-https-1.0.0 dev-perl/libwww-perl dev-perl/TermReadKey dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103013.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=076e5d265dc201dfe5b963d7558151e3
+_md5_=912c38dacef086a7f8d5bfba796f104a
diff --git a/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0 b/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0
index ec3bab12ee97..a1e85ae996da 100644
--- a/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0
+++ b/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Accessor-0.100.0 >=dev-perl/Clone-0.150.0 >=dev-perl/String-Tokenizer-0.50.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/CQL-Parser-1.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dac861c352a284ced8f90cb8c93f39d6
+_md5_=be5e56256fba26f558761d401c1c89d9
diff --git a/metadata/md5-cache/dev-perl/CSS-Packer-2.50.0 b/metadata/md5-cache/dev-perl/CSS-Packer-2.50.0
index b577d6b07a73..cde0464dfa65 100644
--- a/metadata/md5-cache/dev-perl/CSS-Packer-2.50.0
+++ b/metadata/md5-cache/dev-perl/CSS-Packer-2.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Regexp-RegGrp-1.1.1_rc dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CSS-Packer-2.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=54cc43ae0ee18116bda909616b927b85
+_md5_=bbb907c4b633f58d5d1f61d04cae33c0
diff --git a/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1 b/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1
index 9dae774b3728..3dbcdc54f13d 100644
--- a/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/URI virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSIBLEY/CSS-Squish-0.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d9a1bcd8bba52d92bb4921ccd37d2661
+_md5_=c470bd7c47af44bc848f5298068d4b92
diff --git a/metadata/md5-cache/dev-perl/CSS-Tiny-1.200.0 b/metadata/md5-cache/dev-perl/CSS-Tiny-1.200.0
index 66ff2b71be0b..e7d6064c6e77 100644
--- a/metadata/md5-cache/dev-perl/CSS-Tiny-1.200.0
+++ b/metadata/md5-cache/dev-perl/CSS-Tiny-1.200.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/CSS-Tiny-1.20.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f43c621f20bf854219f19f399c7ff74b
+_md5_=4eaf80ec05a26546b1adca69164435ff
diff --git a/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.250.0 b/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.250.0
index 3f7d2568d9d0..0dd0de5715a6 100644
--- a/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.250.0
+++ b/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.250.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.25.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a1a5f2cfad2b06f49cafe2458bfb16c0
+_md5_=f2025cf617b53276f7ab06aa835f9a48
diff --git a/metadata/md5-cache/dev-perl/Cairo-1.106.0 b/metadata/md5-cache/dev-perl/Cairo-1.106.0
index 2c968c554fa5..704a294b19c5 100644
--- a/metadata/md5-cache/dev-perl/Cairo-1.106.0
+++ b/metadata/md5-cache/dev-perl/Cairo-1.106.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/cairo-1.0.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.106.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bf0cca68d4d183b5c76415481d27afe8
+_md5_=9ca6a7688428cced7309e88229c63a97
diff --git a/metadata/md5-cache/dev-perl/Calendar-Simple-1.230.0 b/metadata/md5-cache/dev-perl/Calendar-Simple-1.230.0
index c258109a4c7e..0c27342feea8 100644
--- a/metadata/md5-cache/dev-perl/Calendar-Simple-1.230.0
+++ b/metadata/md5-cache/dev-perl/Calendar-Simple-1.230.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~hppa ~ppc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Time-Local dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Calendar-Simple-1.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ed8501e5b73329e520bcdd74af41e261
+_md5_=75808592adc343e4e2a26151c58d6086
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.460.0 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.460.0
index d9a8918b8a71..14663ed45029 100644
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.460.0
+++ b/metadata/md5-cache/dev-perl/Capture-Tiny-0.460.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.46.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8b9d699abcf125f7045d8cc531ae47c8
+_md5_=fc88a0aa8891841f9d91f353e5232c05
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0
index e161547361f2..f3957260ec85 100644
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0
+++ b/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=621b56d62f0ce12b14c3936782a9e7ce
+_md5_=006d049ccf36da3c7eff59f79ba456be
diff --git a/metadata/md5-cache/dev-perl/Carp-Always-0.130.0 b/metadata/md5-cache/dev-perl/Carp-Always-0.130.0
index c0b7d749c05d..e87c7c0bef2d 100644
--- a/metadata/md5-cache/dev-perl/Carp-Always-0.130.0
+++ b/metadata/md5-cache/dev-perl/Carp-Always-0.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Carp-Always-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a4c735b92af1a1681f170c53388df70c
+_md5_=99b488dfdea6a98a4528712ff36528f8
diff --git a/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0 b/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0
index c704c7ede80c..b18828981035 100644
--- a/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0
+++ b/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aeea85479f5bf8e3bebf966032824139
+_md5_=b8c4fa1268697bb2817dd32c620d93fa
diff --git a/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0 b/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0
index 4a5ea1768c3b..0a8bbd540c22 100644
--- a/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0
+++ b/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Carp-Assert virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=519709f8a8f6405be58a5de5762a4263
+_md5_=6f412e87f3711858e525f7d07935749c
diff --git a/metadata/md5-cache/dev-perl/Carp-Clan-6.60.0 b/metadata/md5-cache/dev-perl/Carp-Clan-6.60.0
index 5fe69de88c8c..62a16f1e3de1 100644
--- a/metadata/md5-cache/dev-perl/Carp-Clan-6.60.0
+++ b/metadata/md5-cache/dev-perl/Carp-Clan-6.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/Carp-Clan-6.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=014b4572f24156d82a1f5b347974543f
+_md5_=ceb2eda55da7787e680ddde4491ac4d6
diff --git a/metadata/md5-cache/dev-perl/Chart-2.4.10 b/metadata/md5-cache/dev-perl/Chart-2.4.10
index e6e15267759c..ddbf5dd21ec4 100644
--- a/metadata/md5-cache/dev-perl/Chart-2.4.10
+++ b/metadata/md5-cache/dev-perl/Chart-2.4.10
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/GD-2.0.36 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHARTGRP/Chart-2.4.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=079ce7ec365316fea13753078996d712
+_md5_=59ada74d2541e12ee569c924fe7d3b6d
diff --git a/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0 b/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0
index a93ea56c3e9a..61d99f873e4c 100644
--- a/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0
+++ b/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ~arm ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTG/Chatbot-Eliza-1.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=222bc70e1c042a1fca2d851462bcdb5c
+_md5_=d687bcbbf90dd14c8c3780180613cfec
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-Grouped-0.100.120 b/metadata/md5-cache/dev-perl/Class-Accessor-Grouped-0.100.120
index 25f4afacec94..b44d5d8d1f28 100644
--- a/metadata/md5-cache/dev-perl/Class-Accessor-Grouped-0.100.120
+++ b/metadata/md5-cache/dev-perl/Class-Accessor-Grouped-0.100.120
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Module-Runtime-0.12.0 >=dev-perl/Class-XSAccessor-1.190.0 >=dev-perl/Sub-Name-0.50.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10012.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3979a362bbe643d15348601cd71896f3
+_md5_=7299b5010a2e596e60f5ec202fc536cb
diff --git a/metadata/md5-cache/dev-perl/Class-Adapter-1.80.0-r1 b/metadata/md5-cache/dev-perl/Class-Adapter-1.80.0-r1
index 5e9335058978..afcd3ac38a0f 100644
--- a/metadata/md5-cache/dev-perl/Class-Adapter-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Adapter-1.80.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.10 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Class-Adapter-1.08.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=36d5a34cb814694a27b31e851168bf88
+_md5_=0988e5347c155fc9a988a85bc5065a58
diff --git a/metadata/md5-cache/dev-perl/Class-Base-0.80.0 b/metadata/md5-cache/dev-perl/Class-Base-0.80.0
index 8c1f390a6e01..ab5d6e62b1f9 100644
--- a/metadata/md5-cache/dev-perl/Class-Base-0.80.0
+++ b/metadata/md5-cache/dev-perl/Class-Base-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZABGAB/Class-Base-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cf36a355df71ef65d43dbd8b021b8a11
+_md5_=0462dad0ab80c9133f73e6ac5ed83043
diff --git a/metadata/md5-cache/dev-perl/Class-C3-0.330.0 b/metadata/md5-cache/dev-perl/Class-C3-0.330.0
index d7fd9b20d56c..28798369f471 100644
--- a/metadata/md5-cache/dev-perl/Class-C3-0.330.0
+++ b/metadata/md5-cache/dev-perl/Class-C3-0.330.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-aix ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Algorithm-C3-0.70.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.33.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=59d48c982d3588a15a35f628117e5c02
+_md5_=d7760a1e8e0047c72386c29152628087
diff --git a/metadata/md5-cache/dev-perl/Class-C3-Componentised-1.1.0-r1 b/metadata/md5-cache/dev-perl/Class-C3-Componentised-1.1.0-r1
index 2e46bdcfbc70..3b8f2c8f6944 100644
--- a/metadata/md5-cache/dev-perl/Class-C3-Componentised-1.1.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-C3-Componentised-1.1.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MRO-Compat dev-perl/Class-Inspector >=dev-perl/Class-C3-0.20 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FREW/Class-C3-Componentised-1.001000.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56ba8ca5729874d97e00e1d44e3ae393
+_md5_=e42421fe3c7718b09d38047eacd0b0c0
diff --git a/metadata/md5-cache/dev-perl/Class-C3-XS-0.140.0 b/metadata/md5-cache/dev-perl/Class-C3-XS-0.140.0
index 3de50a6f4cc4..21cb5db108bc 100644
--- a/metadata/md5-cache/dev-perl/Class-C3-XS-0.140.0
+++ b/metadata/md5-cache/dev-perl/Class-C3-XS-0.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ppc sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-C3-XS-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=83a2d8c49fd0c6cc69e48dd8214cd94a
+_md5_=ada593b26c03bcf4c2ff458459991bb4
diff --git a/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r2 b/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r2
index 3cfbdbb48502..edbb49880306 100644
--- a/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r2
+++ b/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc ppc64 x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Class-Accessor-0.18.0 >=dev-perl/Class-Trigger-0.70.0 >=virtual/perl-File-Temp-0.120.0 virtual/perl-Storable >=virtual/perl-Scalar-List-Utils-1.80.0 dev-perl/Clone >=dev-perl/Ima-DBI-0.330.0 virtual/perl-version >=dev-perl/UNIVERSAL-moniker-0.60.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Class-DBI-v3.0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=104394a026794464f69f5bc20603bfd9
+_md5_=36d13686d54c94e6d6e14592de42cb13
diff --git a/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r2 b/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r2
index 258e1ddf258b..b731089a7360 100644
--- a/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r2
+++ b/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b080f6599ceaa4790a610fe9097e1e64
+_md5_=2e24512c2ca4ac34a128cbdd2ff22f30
diff --git a/metadata/md5-cache/dev-perl/Class-ISA-0.360.0 b/metadata/md5-cache/dev-perl/Class-ISA-0.360.0
index d42a70ccd274..2b65c950de3c 100644
--- a/metadata/md5-cache/dev-perl/Class-ISA-0.360.0
+++ b/metadata/md5-cache/dev-perl/Class-ISA-0.360.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Class-ISA-0.36.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0cfddb9e9f48b52a9eacebfd8d0d7bbd
+_md5_=7bc63a07143f502e7ccbb5872fee99c7
diff --git a/metadata/md5-cache/dev-perl/Class-InsideOut-1.140.0 b/metadata/md5-cache/dev-perl/Class-InsideOut-1.140.0
index 5df69cef3866..8a583e2ac9b9 100644
--- a/metadata/md5-cache/dev-perl/Class-InsideOut-1.140.0
+++ b/metadata/md5-cache/dev-perl/Class-InsideOut-1.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp dev-perl/Class-ISA virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.90.0 virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-InsideOut-1.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3fcd2087fb99f853a8288b26a538167b
+_md5_=e7361d5b8b3a5d7c9bee159176eadd2e
diff --git a/metadata/md5-cache/dev-perl/Class-Load-0.240.0 b/metadata/md5-cache/dev-perl/Class-Load-0.240.0
index ef0f10e04b5e..3537710cc398 100644
--- a/metadata/md5-cache/dev-perl/Class-Load-0.240.0
+++ b/metadata/md5-cache/dev-perl/Class-Load-0.240.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Data-OptList virtual/perl-Exporter >=dev-perl/Module-Implementation-0.40.0 >=dev-perl/Module-Runtime-0.12.0 >=dev-perl/Package-Stash-0.140.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Load-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fe0833ae4457c2677389502c09ced939
+_md5_=1e4098d36fda8b048d0bb148419a16c6
diff --git a/metadata/md5-cache/dev-perl/Class-Load-XS-0.100.0 b/metadata/md5-cache/dev-perl/Class-Load-XS-0.100.0
index b0f8d9143ddd..0ff3d3e868e2 100644
--- a/metadata/md5-cache/dev-perl/Class-Load-XS-0.100.0
+++ b/metadata/md5-cache/dev-perl/Class-Load-XS-0.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Class-Load-0.200.0 virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Load-XS-0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bc2ddb7115a25f7d8cff7893a95436d4
+_md5_=1f1d128e7a12d990e1d76443c079ce61
diff --git a/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.120.0 b/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.120.0
index 9fbe9ea3e178..f775585ee6d0 100644
--- a/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.120.0
+++ b/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3d0eadd11f5fb6c41360e07cd8b4a0bb
+_md5_=2ed7ed17140aae55733fc525f0cdb029
diff --git a/metadata/md5-cache/dev-perl/Class-Mix-0.6.0 b/metadata/md5-cache/dev-perl/Class-Mix-0.6.0
index 4367ffb02297..f9931697d57a 100644
--- a/metadata/md5-cache/dev-perl/Class-Mix-0.6.0
+++ b/metadata/md5-cache/dev-perl/Class-Mix-0.6.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=virtual/perl-Carp dev-perl/Params-Classify virtual/perl-Exporter virtual/perl-if virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Class-Mix-0.006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=90168774158afca4449a6e356d6a751c
+_md5_=73a02b214b8735e2d7ec3f8df3706afc
diff --git a/metadata/md5-cache/dev-perl/Class-Std-0.13.0 b/metadata/md5-cache/dev-perl/Class-Std-0.13.0
index aa1995ed19f7..be53fb0803be 100644
--- a/metadata/md5-cache/dev-perl/Class-Std-0.13.0
+++ b/metadata/md5-cache/dev-perl/Class-Std-0.13.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Class-Std-0.013.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=72511172292b2e5f6366b0f976897b07
+_md5_=7870c6f399183b0471b860b229a66cef
diff --git a/metadata/md5-cache/dev-perl/Class-Std-Fast-0.0.8-r1 b/metadata/md5-cache/dev-perl/Class-Std-Fast-0.0.8-r1
index 832965d4089b..358020f1ef2a 100644
--- a/metadata/md5-cache/dev-perl/Class-Std-Fast-0.0.8-r1
+++ b/metadata/md5-cache/dev-perl/Class-Std-Fast-0.0.8-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Std-0.11.0 virtual/perl-version virtual/perl-Data-Dumper virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AC/ACID/Class-Std-Fast-v0.0.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad493ad04c6feb5aac67f7e2b58fe040
+_md5_=a0ac5790d2fcce3557c1fd7f3c13b8cf
diff --git a/metadata/md5-cache/dev-perl/Class-Tiny-1.6.0 b/metadata/md5-cache/dev-perl/Class-Tiny-1.6.0
index d020f06b5b0f..c6680876e92f 100644
--- a/metadata/md5-cache/dev-perl/Class-Tiny-1.6.0
+++ b/metadata/md5-cache/dev-perl/Class-Tiny-1.6.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5be42880c93b6862cabe63a864629a2b
+_md5_=7e931c65fc2b96424ff0058501c94932
diff --git a/metadata/md5-cache/dev-perl/Class-Unload-0.110.0 b/metadata/md5-cache/dev-perl/Class-Unload-0.110.0
index bcb2ac3f515b..9626ecb22d36 100644
--- a/metadata/md5-cache/dev-perl/Class-Unload-0.110.0
+++ b/metadata/md5-cache/dev-perl/Class-Unload-0.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Inspector dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/Class-Unload-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=021b02711b3412e46fe4b063282f52b8
+_md5_=6b625c138b11e15d5a4b66caf9257cc4
diff --git a/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0 b/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0
index da7eeadf36a9..7101f88a54e4 100644
--- a/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0
+++ b/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ~ppc sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Carp-Assert-0.100.0 >=dev-perl/Class-ISA-0.31 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Class-Virtual-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2ea2da42b63ceda7a713d556ec9b55a2
+_md5_=5c9b9e22fd2497a91f7cf8992db8ffa2
diff --git a/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1 b/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1
index f50200bef2d5..fd4b167198e2 100644
--- a/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/Class-XPath-1.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc6638c8763c7004e15dc450030902cf
+_md5_=7c1e443348dccf5c686878a587b294b2
diff --git a/metadata/md5-cache/dev-perl/Clone-0.390.0 b/metadata/md5-cache/dev-perl/Clone-0.390.0
index b967f8e6c80e..00bcd3ed243e 100644
--- a/metadata/md5-cache/dev-perl/Clone-0.390.0
+++ b/metadata/md5-cache/dev-perl/Clone-0.390.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GARU/Clone-0.39.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bf2805a595f43ccf7a30a65214151f9b
+_md5_=b622141e589b3ec55c7cea699008dcd1
diff --git a/metadata/md5-cache/dev-perl/Color-Calc-1.74.0 b/metadata/md5-cache/dev-perl/Color-Calc-1.74.0
index 048c715c11f1..bd63f3c322c0 100644
--- a/metadata/md5-cache/dev-perl/Color-Calc-1.74.0
+++ b/metadata/md5-cache/dev-perl/Color-Calc-1.74.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Graphics-ColorNames-2.100.0 >=dev-perl/Graphics-ColorNames-WWW-0.10.0 !minimal? ( >=dev-perl/Graphics-ColorObject-0.5.0 ) >=dev-perl/Params-Validate-0.750.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Color-Calc-1.074.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6700c9a35ee3ba515f269dde15de20fc
+_md5_=5836a5eeaf56bb3e5b1a6a2840b30736
diff --git a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1 b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
index 7012d38122d2..b6fe1750560a 100644
--- a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
+++ b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Module-Pluggable dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROKR/Color-Library-0.021.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5f02bdba9dd35042a00c745d173ef316
+_md5_=d2e125633b1bb42eb2ad4e0c756f274d
diff --git a/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0 b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0
index 02562e649950..f525cccf9c8d 100644
--- a/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0
+++ b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ~mips sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-arch/bzip2 virtual/perl-Carp virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4c581409cbdcaa2935bbd88dbb959a81
+_md5_=728693dbdadc8ad262c89eaac47ffd84
diff --git a/metadata/md5-cache/dev-perl/Conf-Libconfig-0.100.0 b/metadata/md5-cache/dev-perl/Conf-Libconfig-0.100.0
index 1aaec4e6fb16..8fb967a0d390 100644
--- a/metadata/md5-cache/dev-perl/Conf-Libconfig-0.100.0
+++ b/metadata/md5-cache/dev-perl/Conf-Libconfig-0.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libconfig virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CN/CNANGEL/Conf-Libconfig-0.100.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e383259631f52c63210dee79db7a6edc
+_md5_=4e235250571211e8b67868949f4facd0
diff --git a/metadata/md5-cache/dev-perl/Config-Any-0.320.0 b/metadata/md5-cache/dev-perl/Config-Any-0.320.0
index 26c5bb48d264..718d78891868 100644
--- a/metadata/md5-cache/dev-perl/Config-Any-0.320.0
+++ b/metadata/md5-cache/dev-perl/Config-Any-0.320.0
@@ -7,7 +7,8 @@ IUSE=test +conf +ini +json +xml +yaml
 KEYWORDS=amd64 arm ppc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Module-Pluggable-3.600.0 conf? ( >=dev-perl/Config-General-2.470.0 ) !conf? ( !<dev-perl/config-general-2.470.0 !<dev-perl/Config-General-2.470.0 ) ini? ( dev-perl/Config-Tiny ) json? ( || ( dev-perl/Cpanel-JSON-XS dev-perl/JSON-MaybeXS dev-perl/JSON-XS >=virtual/perl-JSON-PP-2 dev-perl/JSON ) ) xml? ( dev-perl/XML-NamespaceSupport dev-perl/XML-Simple ) yaml? ( || ( dev-perl/YAML-LibYAML >=dev-perl/YAML-Syck-0.700.0 dev-perl/YAML ) ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dcdb3fdaabc9f714628c95c5c959aab0
+_md5_=e9579e7c7834167948f43f0027a9807a
diff --git a/metadata/md5-cache/dev-perl/Config-Auto-0.440.0 b/metadata/md5-cache/dev-perl/Config-Auto-0.440.0
index ed21d6961b20..20aedddefac0 100644
--- a/metadata/md5-cache/dev-perl/Config-Auto-0.440.0
+++ b/metadata/md5-cache/dev-perl/Config-Auto-0.440.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Config-IniFiles dev-perl/IO-String virtual/perl-Text-ParseWords virtual/perl-File-Spec >=dev-perl/YAML-0.670.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Config-Auto-0.44.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5e4cc3fe495e05ebcca687c02fbc35bb
+_md5_=8a189373b4fd8c4f098841afd05634fd
diff --git a/metadata/md5-cache/dev-perl/Config-AutoConf-0.315.0 b/metadata/md5-cache/dev-perl/Config-AutoConf-0.315.0
index 8c8b111f6bc9..97093f49b0a9 100644
--- a/metadata/md5-cache/dev-perl/Config-AutoConf-0.315.0
+++ b/metadata/md5-cache/dev-perl/Config-AutoConf-0.315.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-CBuilder-0.280.220 virtual/perl-File-Spec virtual/perl-File-Temp >=virtual/perl-Scalar-List-Utils-1.180.0 virtual/perl-Text-ParseWords dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.315.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9ac90ff7de5e1a05574ad9b941ffbbd1
+_md5_=a0569520d6eba40cfd30bb21993b42ab
diff --git a/metadata/md5-cache/dev-perl/Config-Grammar-1.120.0 b/metadata/md5-cache/dev-perl/Config-Grammar-1.120.0
index f3bed0df278c..3487f6fa34f4 100644
--- a/metadata/md5-cache/dev-perl/Config-Grammar-1.120.0
+++ b/metadata/md5-cache/dev-perl/Config-Grammar-1.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~hppa ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSCHWEI/Config-Grammar-1.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d795bc4ab327ed518907699b5a635c64
+_md5_=cc49c80895b404917f27dc654fb87059
diff --git a/metadata/md5-cache/dev-perl/Config-INI-0.25.0 b/metadata/md5-cache/dev-perl/Config-INI-0.25.0
index 55e7f5c60896..661319dbcda6 100644
--- a/metadata/md5-cache/dev-perl/Config-INI-0.25.0
+++ b/metadata/md5-cache/dev-perl/Config-INI-0.25.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Mixin-Linewise-0.105.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.025.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2f0f038b9171809d30ab59d9ef786d86
+_md5_=aae6bf8a7aac33ff64e261aaf9c43908
diff --git a/metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0 b/metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0
index 57bcc21f3ca4..09dbc01ba705 100644
--- a/metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0
+++ b/metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Temp dev-perl/IO-stringy >=virtual/perl-Scalar-List-Utils-1.330.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.94.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e426833c4aebef36d30b5d3752d73acf
+_md5_=404f74dc4557b06291397c2cef5aab6a
diff --git a/metadata/md5-cache/dev-perl/Config-JSON-1.520.200 b/metadata/md5-cache/dev-perl/Config-JSON-1.520.200
index 4367386abf6f..a027f10ab61f 100644
--- a/metadata/md5-cache/dev-perl/Config-JSON-1.520.200
+++ b/metadata/md5-cache/dev-perl/Config-JSON-1.520.200
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Temp-0.180.0 >=dev-perl/JSON-2.160.0 >=virtual/perl-Scalar-List-Utils-1.190.0 dev-perl/Moo dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RI/RIZEN/Config-JSON-1.5202.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ee94a36f1767bd70e44b363272c1963
+_md5_=8d17082e46b23dfe07616cf77b20d790
diff --git a/metadata/md5-cache/dev-perl/Config-MVP-2.200.10 b/metadata/md5-cache/dev-perl/Config-MVP-2.200.10
index f7ce5dacbb4d..6934bd9d2db9 100644
--- a/metadata/md5-cache/dev-perl/Config-MVP-2.200.10
+++ b/metadata/md5-cache/dev-perl/Config-MVP-2.200.10
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Load-0.170.0 virtual/perl-File-Spec dev-perl/Module-Pluggable dev-perl/Module-Runtime >=dev-perl/Moose-0.910.0 dev-perl/MooseX-OneArgNew dev-perl/Params-Util dev-perl/Role-HasMessage dev-perl/Role-Identifiable dev-perl/Throwable dev-perl/Tie-IxHash dev-perl/Try-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200010.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e570673022e89327be805ca3078046e4
+_md5_=4c07a10b902acaf0a7b7e9868efb9633
diff --git a/metadata/md5-cache/dev-perl/Config-MVP-Reader-INI-2.101.463 b/metadata/md5-cache/dev-perl/Config-MVP-Reader-INI-2.101.463
index 40d8f0e6d63a..311371088326 100644
--- a/metadata/md5-cache/dev-perl/Config-MVP-Reader-INI-2.101.463
+++ b/metadata/md5-cache/dev-perl/Config-MVP-Reader-INI-2.101.463
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Config-INI >=dev-perl/Config-MVP-2 dev-perl/Moose virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-Reader-INI-2.101463.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9c172fb586f098a738151b06c59a95fe
+_md5_=6d78e7d30660fafe1cd1c86b24c8a8a1
diff --git a/metadata/md5-cache/dev-perl/Config-Properties-1.800.0 b/metadata/md5-cache/dev-perl/Config-Properties-1.800.0
index 3e1f15190977..957ab937c198 100644
--- a/metadata/md5-cache/dev-perl/Config-Properties-1.800.0
+++ b/metadata/md5-cache/dev-perl/Config-Properties-1.800.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp >=virtual/perl-Text-Tabs+Wrap-2001.92.900 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Config-Properties-1.80.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6628a4d1bf4bc991d5c2daf014ad4bce
+_md5_=1be0f96697734f8bb19cb5db5c74670b
diff --git a/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0 b/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
index 6110ad80df52..be4e5aa12310 100644
--- a/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
+++ b/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-3.300.0 >=virtual/perl-File-Temp-0.220.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.23.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0a8b392f1440e9b40dd7ceae4bc32b7d
+_md5_=f0fe017a52a8e8be13d8287d2b8774f6
diff --git a/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1 b/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
index 17746ce96c3f..fa86f7e45537 100644
--- a/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
+++ b/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-Storable >=dev-perl/Sub-Exporter-Progressive-0.1.7 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=df6f3cae81d715282b62414fd1804c03
+_md5_=daf8bbe438c8e67ea5b7a8090d1ad4df
diff --git a/metadata/md5-cache/dev-perl/Context-Preserve-0.20.0 b/metadata/md5-cache/dev-perl/Context-Preserve-0.20.0
index ba0cc2a3520f..6bc926e0d838 100644
--- a/metadata/md5-cache/dev-perl/Context-Preserve-0.20.0
+++ b/metadata/md5-cache/dev-perl/Context-Preserve-0.20.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Context-Preserve-0.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=578335a7d8f1c272b91373352105f937
+_md5_=beb9ce3196d81a80dcdc3e8c953545b1
diff --git a/metadata/md5-cache/dev-perl/Contextual-Return-0.4.14 b/metadata/md5-cache/dev-perl/Contextual-Return-0.4.14
index 3afec071eca5..a23c5be71515 100644
--- a/metadata/md5-cache/dev-perl/Contextual-Return-0.4.14
+++ b/metadata/md5-cache/dev-perl/Contextual-Return-0.4.14
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Want virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCONWAY/Contextual-Return-0.004014.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6a29e1683864cc3bcd6693a57dad4205
+_md5_=c7b98a0f23ee26e1e1af2ce83e917737
diff --git a/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0 b/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0
index 94e60ee9b39d..2fc20678abf1 100644
--- a/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0
+++ b/metadata/md5-cache/dev-perl/Convert-ASN1-0.270.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.27.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a45e6aa8c2fa3e256906d401a9cef714
+_md5_=43bdfbf14e88f1f7e1b920dfce75837e
diff --git a/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0 b/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0
index b2154a2fad89..9669d9e95795 100644
--- a/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0
+++ b/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STEPHEN/Convert-BinHex-1.125.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ab1af76c960b99787a9054ea9afe8de7
+_md5_=b690b84cbc38f3e29ab3c7bdd250c18d
diff --git a/metadata/md5-cache/dev-perl/Convert-Color-0.110.0 b/metadata/md5-cache/dev-perl/Convert-Color-0.110.0
index 31773ff656ea..c87eb226b1a0 100644
--- a/metadata/md5-cache/dev-perl/Convert-Color-0.110.0
+++ b/metadata/md5-cache/dev-perl/Convert-Color-0.110.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Module-Pluggable dev-perl/List-UtilsBy dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=43e4d6d521fdb4cfd9df7c7d082953b2
+_md5_=b207ce23eb511262de4ebbd290976209
diff --git a/metadata/md5-cache/dev-perl/Convert-UUlib-1.500.0-r1 b/metadata/md5-cache/dev-perl/Convert-UUlib-1.500.0-r1
index ef3c530cdc9b..51893e9a0807 100644
--- a/metadata/md5-cache/dev-perl/Convert-UUlib-1.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-UUlib-1.500.0-r1
@@ -7,7 +7,8 @@ IUSE=system-uulib test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-uulib? ( >=dev-libs/uulib-0.5.20-r1 ) dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Convert-UUlib-1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3717c5ea6d80518fe22c9469f6f9b4ea
+_md5_=c470f6c3f1a90b37b55727f4281e3f41
diff --git a/metadata/md5-cache/dev-perl/Cookie-Baker-0.80.0 b/metadata/md5-cache/dev-perl/Cookie-Baker-0.80.0
index 74ece551fe1e..a6401ce42cd9 100644
--- a/metadata/md5-cache/dev-perl/Cookie-Baker-0.80.0
+++ b/metadata/md5-cache/dev-perl/Cookie-Baker-0.80.0
@@ -7,7 +7,8 @@ IUSE=test +xs
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-perl/URI xs? ( >=dev-perl/Cookie-Baker-XS-0.80.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b47bd2ac446d913971746b145c0e68f4
+_md5_=2cc942297dcb7cd66b5b325e8dab0df3
diff --git a/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.80.0 b/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.80.0
index 7559918af2a8..617e709e58ef 100644
--- a/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.80.0
+++ b/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-XS-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=28e8c9c062bd3d4585b04387a6ba98f0
+_md5_=428b4e970751a886401c1ad40d8e3278
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
index 1ed1f267fa02..c8ddd2f89750 100644
--- a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
+++ b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-3.0239.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dd057930325b71d0a8de19c292a03c8f
+_md5_=2dea763919a81e1ce498803ea1fda1f3
diff --git a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1 b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
index c9c8cd5b6d35..81431f689a66 100644
--- a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic
 RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.33.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9fb0ecdbe0543a0cfcd1dc203dfc174
+_md5_=e16f57e1a6d5d95ebe34edd2ee431e2f
diff --git a/metadata/md5-cache/dev-perl/Crypt-CipherSaber-1.10.0-r1 b/metadata/md5-cache/dev-perl/Crypt-CipherSaber-1.10.0-r1
index d4d8b83633ab..cddcdf087a75 100644
--- a/metadata/md5-cache/dev-perl/Crypt-CipherSaber-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-CipherSaber-1.10.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.4.2 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Crypt-CipherSaber-1.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fb33620aefddd16f06cf03fd64cd9f42
+_md5_=8111053996c04eb00a3fe93e5032e311
diff --git a/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r1
index 93a0f73fb603..54e0f304011f 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-libs/cracklib dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Crypt-Cracklib-1.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cd8fad99e2fa7678c416e19176fac5d4
+_md5_=c14543128a5b1c8fd865be131efd9350
diff --git a/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r2 b/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r2
index efbc38b1dee2..17217c084b9f 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r2
+++ b/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-libs/cracklib dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Crypt-Cracklib-1.7.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a14987356a61d53e4809d239bb24b401
+_md5_=cb7f7f8f824b1ef96f049265420dd1e9
diff --git a/metadata/md5-cache/dev-perl/Crypt-Curve25519-0.60.0 b/metadata/md5-cache/dev-perl/Crypt-Curve25519-0.60.0
index dce65b3201a1..454938a2716f 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Curve25519-0.60.0
+++ b/metadata/md5-cache/dev-perl/Crypt-Curve25519-0.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8fca621607e3377c31b7a5535664298a
+_md5_=f3567cd3ebd96ba86232efa74e83420c
diff --git a/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1 b/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
index 39d18718118e..a23b6e7b2fe0 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=DES
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-2.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=78711b7b90a0ac4c084efad1a2f6f8d4
+_md5_=deff0678aac76f874e4170fdb9d06e98
diff --git a/metadata/md5-cache/dev-perl/Crypt-DH-GMP-0.0.120 b/metadata/md5-cache/dev-perl/Crypt-DH-GMP-0.0.120
index f39233e2cd46..b190f642c7de 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DH-GMP-0.0.120
+++ b/metadata/md5-cache/dev-perl/Crypt-DH-GMP-0.0.120
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-XSLoader-0.20.0 >=dev-libs/gmp-4.0.0:0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMAKI/Crypt-DH-GMP-0.00012.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d6df7c701352ea3aac087b3d8eb67b22
+_md5_=89c58d1bcfae0fa2bb9124d8e5990db1
diff --git a/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0 b/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
index 292751886f35..c86a57f710f2 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
+++ b/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ppc sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Buffer dev-perl/Digest-SHA1 virtual/perl-File-Spec dev-perl/File-Which virtual/perl-MIME-Base64 >=virtual/perl-Math-BigInt-1.78 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Crypt-DSA-1.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=87e37c15a2d974ff055a01a5fe110689
+_md5_=56cbdd4d96d8e6e71e4ef688348f571b
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.120.0 b/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.120.0
index f7d784f475f2..1aad24ff093b 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.120.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-RSA dev-perl/Crypt-Blowfish dev-perl/Crypt-CAST5_PP dev-perl/Crypt-DES_EDE3 dev-perl/Crypt-DSA dev-perl/Crypt-IDEA dev-perl/Crypt-RIPEMD160 dev-perl/Crypt-Rijndael >=dev-perl/Crypt-Twofish-2.00 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA dev-perl/File-HomeDir virtual/perl-IO-Compress dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Math-BigInt dev-perl/TermReadKey dev-perl/URI >=dev-perl/Data-Buffer-0.04 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SROMANOV/Crypt-OpenPGP-1.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=53db194967b68f5347e7ef1040602745
+_md5_=21b324ac179c044d56eb8363c74b7674
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-EC-1.310.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-EC-1.310.0
index f9579fbe66bb..917bd5fb82eb 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-EC-1.310.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-EC-1.310.0
@@ -7,7 +7,8 @@ IUSE=test libressl
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Crypt-OpenSSL-Bignum-0.40.0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Crypt-OpenSSL-EC-1.31.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=94a5c73efbafaaf5b5e46b93a95d28ec
+_md5_=9a768127d60c0617a0f36954e0167869
diff --git a/metadata/md5-cache/dev-perl/Crypt-RIPEMD160-0.60.0 b/metadata/md5-cache/dev-perl/Crypt-RIPEMD160-0.60.0
index 9125ba956f9a..4b5895d5bd80 100644
--- a/metadata/md5-cache/dev-perl/Crypt-RIPEMD160-0.60.0
+++ b/metadata/md5-cache/dev-perl/Crypt-RIPEMD160-0.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Crypt-RIPEMD160-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9ae7ab769dc232101bc7a9a83425f1ab
+_md5_=cc848960a6e2cead7b8b40adc982a4c9
diff --git a/metadata/md5-cache/dev-perl/Crypt-Random-Source-0.120.0 b/metadata/md5-cache/dev-perl/Crypt-Random-Source-0.120.0
index 4f3ce2980113..b641ae75073f 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Random-Source-0.120.0
+++ b/metadata/md5-cache/dev-perl/Crypt-Random-Source-0.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Capture-Tiny-0.80.0 virtual/perl-Carp virtual/perl-File-Spec >=virtual/perl-IO-1.140.0 dev-perl/Module-Find dev-perl/Module-Runtime >=dev-perl/Moo-1.2.0 dev-perl/Sub-Exporter dev-perl/Type-Tiny >=dev-perl/namespace-clean-0.110.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d354a87998343a0f4da7e6240135dbe6
+_md5_=d3729ee535379fb7e974753698ff247f
diff --git a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0 b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0
index 824b7a354dd9..26eda1d4a0ba 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0
+++ b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3c2438e0f7ee770514046ac8a35529f9
+_md5_=b1cc1c86bec484665d5b66901d883acf
diff --git a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.140.0 b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.140.0
index 6c7e22c59a6a..bd4478329187 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.140.0
+++ b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=37d6b357847d947d73d5b1bed4c2a355
+_md5_=afbe894bc1c438d7cecc2bff02b0cb12
diff --git a/metadata/md5-cache/dev-perl/Crypt-SMIME-0.190.0 b/metadata/md5-cache/dev-perl/Crypt-SMIME-0.190.0
index 94946328aa94..24d11ba08d31 100644
--- a/metadata/md5-cache/dev-perl/Crypt-SMIME-0.190.0
+++ b/metadata/md5-cache/dev-perl/Crypt-SMIME-0.190.0
@@ -7,7 +7,8 @@ IUSE=libressl test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.9:0 ) libressl? ( dev-libs/libressl ) virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKAGE/Crypt-SMIME-0.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4cc56d81c02f5ff8b70783c1fd18a4d0
+_md5_=eb05c3719e3a8646fe84ebe949786679
diff --git a/metadata/md5-cache/dev-perl/Crypt-SMIME-0.250.0 b/metadata/md5-cache/dev-perl/Crypt-SMIME-0.250.0
index b25c798f87d4..8cb3ad2209db 100644
--- a/metadata/md5-cache/dev-perl/Crypt-SMIME-0.250.0
+++ b/metadata/md5-cache/dev-perl/Crypt-SMIME-0.250.0
@@ -7,7 +7,8 @@ IUSE=libressl test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.9:0 ) libressl? ( dev-libs/libressl ) virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKAGE/Crypt-SMIME-0.25.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c89eeeb1cdc99e6b61a5a552d65efbf1
+_md5_=1247c07f991fac6c42f7530da62176db
diff --git a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r1 b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r1
index ccae23609288..0d322ba18d19 100644
--- a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~pp
 LICENSE=Artistic-2
 PDEPEND=dev-perl/libwww-perl >=dev-perl/LWP-Protocol-https-6.20.0
 RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.7c:0 ) libressl? ( dev-libs/libressl ) virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e57b3a81e79f387e18ec79f4b4bda18
+_md5_=aa9e264fd461c7f3a19b084018edb908
diff --git a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r2 b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r2
index 3e5a241c64dc..0c3e4639d48a 100644
--- a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r2
+++ b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~p
 LICENSE=Artistic-2
 PDEPEND=dev-perl/libwww-perl >=dev-perl/LWP-Protocol-https-6.20.0
 RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.7c:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=29b688b96983b15ee0b4f43955f708ec
+_md5_=f1d33ba98fdd76e9982c9866c7362803
diff --git a/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
index e6de454c4b12..adf9423fb86b 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/FreezeThaw virtual/perl-IO-Compress dev-perl/Crypt-Blowfish virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Crypt-Simple-0.06.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=60580d74aac1268cb02f6222f3c2f849
+_md5_=56146e72802d3904df68012cb1d537c7
diff --git a/metadata/md5-cache/dev-perl/Crypt-URandom-0.360.0 b/metadata/md5-cache/dev-perl/Crypt-URandom-0.360.0
index d179aac54088..4f8ed5f2d22b 100644
--- a/metadata/md5-cache/dev-perl/Crypt-URandom-0.360.0
+++ b/metadata/md5-cache/dev-perl/Crypt-URandom-0.360.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DD/DDICK/Crypt-URandom-0.36.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f73f14caca1e00269b808c249dd7cd56
+_md5_=207ff4cdedda477af27a5d04df2aa5b7
diff --git a/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0 b/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
index 4e200bf68f0e..fe5fdac3ef4a 100644
--- a/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
+++ b/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AJ/AJUNG/Crypt-X509-0.51.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dbe13f77626de19c8771a2d5fc597819
+_md5_=98efe3daf2506cc330b4c871e92ced90
diff --git a/metadata/md5-cache/dev-perl/CryptX-0.53.0 b/metadata/md5-cache/dev-perl/CryptX-0.53.0
index d12c040cdc09..0af2d1a467c4 100644
--- a/metadata/md5-cache/dev-perl/CryptX-0.53.0
+++ b/metadata/md5-cache/dev-perl/CryptX-0.53.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.590.0 !minimal? ( || ( dev-perl/Cpanel-JSON-XS dev-perl/JSON-XS virtual/perl-JSON-PP ) ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIK/CryptX-0.053.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1d8eca7502f4f8e015b5e290a1aa3209
+_md5_=d7fbdb29b407ed730f66616c6afd941b
diff --git a/metadata/md5-cache/dev-perl/CryptX-0.64.0 b/metadata/md5-cache/dev-perl/CryptX-0.64.0
index 153a989e50b8..4e3da8299f75 100644
--- a/metadata/md5-cache/dev-perl/CryptX-0.64.0
+++ b/metadata/md5-cache/dev-perl/CryptX-0.64.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( || ( dev-perl/Cpanel-JSON-XS dev-perl/JSON-XS virtual/perl-JSON-PP ) ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIK/CryptX-0.064.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d9f730180440dd85fa5a130ccc93ccef
+_md5_=aea560355de0709f75148cb0bd787431
diff --git a/metadata/md5-cache/dev-perl/Curses-1.360.0 b/metadata/md5-cache/dev-perl/Curses-1.360.0
index 36d011bbe35e..49b156e0cab3 100644
--- a/metadata/md5-cache/dev-perl/Curses-1.360.0
+++ b/metadata/md5-cache/dev-perl/Curses-1.360.0
@@ -7,7 +7,8 @@ IUSE=+unicode test examples
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sys-libs/ncurses-5:0=[unicode?] virtual/perl-Data-Dumper dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.36.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8752363feeca7be6e6560263852de3c4
+_md5_=ff1021266ce13021dc073cba6870890a
diff --git a/metadata/md5-cache/dev-perl/Curses-UI-0.960.900-r2 b/metadata/md5-cache/dev-perl/Curses-UI-0.960.900-r2
index 54c86e6cbb04..2c5b200d17da 100644
--- a/metadata/md5-cache/dev-perl/Curses-UI-0.960.900-r2
+++ b/metadata/md5-cache/dev-perl/Curses-UI-0.960.900-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Curses dev-perl/TermReadKey dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MD/MDXI/Curses-UI-0.9609.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=525f9d002e191a826574d0348de060bc
+_md5_=98ce0a69a1a9c206d9c8161e691ebbf3
diff --git a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0 b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
index b30aceb984ed..4d0d79af0197 100644
--- a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
+++ b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Exporter virtual/perl-if virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cwd-Guard-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5050a200462c07a6a250f1770dad87d6
+_md5_=37f817aecd90a9e793dd3430bfc1df43
diff --git a/metadata/md5-cache/dev-perl/DBD-MariaDB-1.210.0 b/metadata/md5-cache/dev-perl/DBD-MariaDB-1.210.0
index 18e8301d9ffa..9822f049025f 100644
--- a/metadata/md5-cache/dev-perl/DBD-MariaDB-1.210.0
+++ b/metadata/md5-cache/dev-perl/DBD-MariaDB-1.210.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBI-1.608.0 virtual/perl-XSLoader mysql? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) dev-lang/perl:=
 REQUIRED_USE=^^ ( mysql mariadb )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4458a84e762eb5fc528835d1bc908a8f
+_md5_=9a12a240017e9ce9ea701163350640eb
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.560.0 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.560.0
index 6b57d29536e9..c190a1686cf3 100644
--- a/metadata/md5-cache/dev-perl/DBD-SQLite-1.560.0
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.560.0
@@ -7,7 +7,8 @@ IUSE=test system-sqlite
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-sqlite? ( >=dev-db/sqlite-3.21.0[extensions(+)] ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.56.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=594cdcfc921bb0d3334e9d2142ece2ff
+_md5_=66ae20dc27bd95b8996618235a187746
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.580.0 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.580.0
index 78b660882aad..4fbfaba574e4 100644
--- a/metadata/md5-cache/dev-perl/DBD-SQLite-1.580.0
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.580.0
@@ -7,7 +7,8 @@ IUSE=test system-sqlite
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-sqlite? ( >=dev-db/sqlite-3.21.0[extensions(+)] ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.58.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2e34890ac67fd0834852371fd8e4b9b5
+_md5_=18f6e7cd59bc72c0142d79741aa99850
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r1 b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r1
index b45d0a9725b6..8522c3c3a7d6 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r1
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r1
@@ -7,7 +7,8 @@ IUSE=test +ssl
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBI-1.609.0 dev-db/mysql-connector-c:= dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.044.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db8248e2c45b0f763f525b18a1cb7a1d
+_md5_=95b576cc61d942903d961576fcbc7f42
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2 b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2
index be7d61505206..7b65b0fff968 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBI-1.609.0 mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] ) dev-lang/perl:=
 REQUIRED_USE=^^ ( mysql mariadb )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.044.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c9a53a4e1705808df3d6e7b19490266
+_md5_=fc1f08bc3d98222f27559d8464375fac
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0 b/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0
index 6c7eb66d7645..8ec0ba15edb4 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBI-1.609.0 >=dev-perl/Devel-CheckLib-1.109.0 mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] ) dev-lang/perl:=
 REQUIRED_USE=^^ ( mysql mariadb )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=188ebfa391e717bb2f02855ccda41627
+_md5_=521b13ce87e034ed96e5251613947a74
diff --git a/metadata/md5-cache/dev-perl/DBI-1.637.0 b/metadata/md5-cache/dev-perl/DBI-1.637.0
index cf1a01d5af48..d7637f22ff8b 100644
--- a/metadata/md5-cache/dev-perl/DBI-1.637.0
+++ b/metadata/md5-cache/dev-perl/DBI-1.637.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/PlRPC-0.200.0 >=virtual/perl-Sys-Syslog-0.170.0 virtual/perl-File-Spec !<=dev-perl/SQL-Statement-1.330.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/DBI-1.637.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6078c0d15151531a70c2e477df2b3804
+_md5_=ff4545408c69821a65920e9c692d298b
diff --git a/metadata/md5-cache/dev-perl/DBICx-TestDatabase-0.50.0 b/metadata/md5-cache/dev-perl/DBICx-TestDatabase-0.50.0
index 57e0b070eb22..0f2d9bce87a5 100644
--- a/metadata/md5-cache/dev-perl/DBICx-TestDatabase-0.50.0
+++ b/metadata/md5-cache/dev-perl/DBICx-TestDatabase-0.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp >=dev-perl/DBD-SQLite-1.290.0 dev-perl/SQL-Translator dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JROCKWAY/DBICx-TestDatabase-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9f75ed3609bbb55b16de7ff0e5771cbf
+_md5_=77f096c196a44cd702c53e8125743b18
diff --git a/metadata/md5-cache/dev-perl/DBIx-Class-DynamicDefault-0.40.0 b/metadata/md5-cache/dev-perl/DBIx-Class-DynamicDefault-0.40.0
index 09962e127dae..9c7e639f3b29 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Class-DynamicDefault-0.40.0
+++ b/metadata/md5-cache/dev-perl/DBIx-Class-DynamicDefault-0.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBIx-Class-0.81.270 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTROUT/DBIx-Class-DynamicDefault-0.04.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b0646155bcaaec23fbe6f9f8bd313e9d
+_md5_=3f719f9737024cce82ea09518b308101
diff --git a/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-Boolean-0.3.0 b/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-Boolean-0.3.0
index dac0e0f82f5c..cf496aeaa1c0 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-Boolean-0.3.0
+++ b/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-Boolean-0.3.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBIx-Class-0.80.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRAF/DBIx-Class-InflateColumn-Boolean-0.003000.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=85dfd042374bbd3389fffd8221f48fca
+_md5_=70ff7cda03b7338509b36ec8c9ca10e5
diff --git a/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-IP-0.20.30-r1 b/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-IP-0.20.30-r1
index 22d727a3bb46..097e901537d6 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-IP-0.20.30-r1
+++ b/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-IP-0.20.30-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/NetAddr-IP >=dev-perl/DBIx-Class-0.81.70 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-InflateColumn-IP-0.02003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=040a49337d125f68fa2efeddb8f57fab
+_md5_=e999c04f494a7380f1d9731fad634706
diff --git a/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-Object-Enum-0.60.0 b/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-Object-Enum-0.60.0
index df45253df2f7..c0f575c186a2 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-Object-Enum-0.60.0
+++ b/metadata/md5-cache/dev-perl/DBIx-Class-InflateColumn-Object-Enum-0.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBIx-Class dev-perl/Object-Enum dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMMILLS/DBIx-Class-InflateColumn-Object-Enum-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dcd9f892db62ba5e278b58ac5ae26ab1
+_md5_=4d290e009e3d77bc0ece807cd7bbd719
diff --git a/metadata/md5-cache/dev-perl/DBIx-Class-UserStamp-0.110.0-r1 b/metadata/md5-cache/dev-perl/DBIx-Class-UserStamp-0.110.0-r1
index 4e84cb2563cd..9d8f58e5cbf7 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Class-UserStamp-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/DBIx-Class-UserStamp-0.110.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor-Grouped dev-perl/DBIx-Class-DynamicDefault dev-perl/DBIx-Class dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JG/JGOULAH/DBIx-Class-UserStamp-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=89bbbc00d28e336b6c2e9fdfedb324db
+_md5_=ae4a3cd69fe4d2b526dcfd9260e2193e
diff --git a/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1 b/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
index 886d86ae3d32..7841fce8e41e 100644
--- a/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ~ppc ppc64 sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBI-1.37 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/DBIx-ContextualFetch-1.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b90b2a27260bdb77146d9cff95a01d40
+_md5_=af2af220d650d85b12c85c9e25f18280
diff --git a/metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0 b/metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0
index 82ef7c6c038e..825ea1700f6c 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0
+++ b/metadata/md5-cache/dev-perl/DBIx-Migration-0.70.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/DBI dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/DBIx-Migration-0.07.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dcbc1083a321eabae02f8c8ef2d34d44
+_md5_=8443ec138eba1c5be37cd0c6bdcdef42
diff --git a/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.660.0-r1 b/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.660.0-r1
index 71e4906a58b1..4ae4a2347e89 100644
--- a/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.660.0-r1
+++ b/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.660.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Cache-Simple-TimedExpiry-0.210.0 >=dev-perl/capitalization-0.30.0 >=dev-perl/Class-ReturnValue-0.400.0 dev-perl/Class-Accessor dev-perl/Clone dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/DBIx-SearchBuilder-1.66.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=09434199aa87b5381b0f9f394f5ef4d5
+_md5_=305212a9cab6df06c19e3936d238ae8b
diff --git a/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.670.0 b/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.670.0
index e0202cbdf933..492b97622345 100644
--- a/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.670.0
+++ b/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.670.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Cache-Simple-TimedExpiry-0.210.0 >=dev-perl/capitalization-0.30.0 >=dev-perl/Class-ReturnValue-0.400.0 dev-perl/Class-Accessor dev-perl/Clone dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=virtual/perl-Encode-1.990.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.67.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e927542b4ce8fa2437d316e50e45d7b1
+_md5_=3b0ce10e948afe8936060ecdbe552966
diff --git a/metadata/md5-cache/dev-perl/DBIx-Simple-1.350.0-r1 b/metadata/md5-cache/dev-perl/DBIx-Simple-1.350.0-r1
index cf89881ea65a..4725177b4a06 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Simple-1.350.0-r1
+++ b/metadata/md5-cache/dev-perl/DBIx-Simple-1.350.0-r1
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( AFL-3.0 AGPL-3 APL-1.0 Apache-2.0 BSD-2 Boost-1.0 CDDL CPAL-1.0 EPL-1.0 ECL-2.0 EUPL-1.1 GPL-2 GPL-3 LGPL-2.1 LGPL-3 HPND IBM IPAfont ISC LPPL-1.3c 9base MIT MPL-2.0 NOSA nethack PHP-3 POSTGRESQL PYTHON CNRI QPL-1.0 OFL-1.1 Sleepycat Watcom-1.0 W3C wxWinLL-3 ZLIB libpng )
 RDEPEND=>=dev-perl/DBI-1.210.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.35.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e44835f2d846547061acfcc6fa6a7360
+_md5_=ee2c6344727f8920441e3a045d9e072c
diff --git a/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0 b/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0
index 1e2e8d0d290c..b7a50b8981d8 100644
--- a/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0
+++ b/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Flock-2013.60.0 dev-perl/File-Slurp virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Text-Tabs+Wrap dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Daemon-Generic-0.85.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b32542ba6aeadad2d244b1c4b6748c41
+_md5_=240b31d6577cabb9dcf35030d484a217
diff --git a/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1 b/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
index 469c7ce731b0..141f3f6fcabb 100644
--- a/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-perl/Any-Moose dev-perl/UNIVERSAL-require dev-perl/XML-LibXML dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TY/TYPESTER/Data-AMF-0.09.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a97a90d3f339c24a143790ab700fb6e
+_md5_=617a3eead21a22a3bd84ca62f8c22f9a
diff --git a/metadata/md5-cache/dev-perl/Data-Compare-1.250.0 b/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
index 369fa701532b..03d879219361 100644
--- a/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
+++ b/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 hppa ~ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Find-Rule-0.100.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9ad1a48538d76192b50884d8a9aaea2
+_md5_=7b39925c0432f5e0f8505f6426a43613
diff --git a/metadata/md5-cache/dev-perl/Data-Dump-Streamer-2.400.0 b/metadata/md5-cache/dev-perl/Data-Dump-Streamer-2.400.0
index f7a0beb283d3..1f886cfce69e 100644
--- a/metadata/md5-cache/dev-perl/Data-Dump-Streamer-2.400.0
+++ b/metadata/md5-cache/dev-perl/Data-Dump-Streamer-2.400.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/B-Utils virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-IO virtual/perl-IO-Compress virtual/perl-MIME-Base64 virtual/perl-Text-Balanced dev-perl/PadWalker virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Data-Dump-Streamer-2.40.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=061bc29d38185a93b140047331cb6ab8
+_md5_=8fe9250840cca467e84c8731e1645e0a
diff --git a/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0 b/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0
index a0fe67072632..9d46b094748c 100644
--- a/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0
+++ b/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Data-Dumper-Concise-2.023.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bb444a2da6a22089c237a46bc06a9cde
+_md5_=6bb8a0e36ee5febb146932fc5e4c8635
diff --git a/metadata/md5-cache/dev-perl/Data-Float-0.13.0 b/metadata/md5-cache/dev-perl/Data-Float-0.13.0
index dd87e5da1354..b375fd5aeae7 100644
--- a/metadata/md5-cache/dev-perl/Data-Float-0.13.0
+++ b/metadata/md5-cache/dev-perl/Data-Float-0.13.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Float-0.013.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=39a61f9b693c41b2f9533567562bc9bb
+_md5_=221808c920f4b97634b80d0af9c503c2
diff --git a/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0 b/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0
index 2fb5622658ed..57a1b5419413 100644
--- a/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0
+++ b/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Image-Size >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.170.0 >=dev-perl/MIME-Types-1.5.0 >=dev-perl/Regexp-Common-0.30.0 dev-perl/Email-Valid virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DF/DFARRELL/Data-FormValidator-4.88.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7d00c2ecfdd04280fd7583a8d651bebd
+_md5_=95bd61767c94b12ee4676cdec0ee9ba0
diff --git a/metadata/md5-cache/dev-perl/Data-GUID-0.49.0 b/metadata/md5-cache/dev-perl/Data-GUID-0.49.0
index bd886b3dc7ca..8dcb555e155a 100644
--- a/metadata/md5-cache/dev-perl/Data-GUID-0.49.0
+++ b/metadata/md5-cache/dev-perl/Data-GUID-0.49.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Data-UUID-1.148.0 >=dev-perl/Sub-Exporter-0.900.0 >=dev-perl/Sub-Install-0.30.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.049.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8abe4b9a29cdaa491830082689651d89
+_md5_=0e3e79af14f021b293425a02d1ba6e55
diff --git a/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1 b/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
index bac47af4767c..9670ee54b0b7 100644
--- a/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ~mips ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8210bad4db356636990ebb0b05fe208
+_md5_=bf9a5de73589e93552713ec3865c7811
diff --git a/metadata/md5-cache/dev-perl/Data-ICal-0.220.0 b/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
index 1a00a79fb72f..49102d6c5737 100644
--- a/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
+++ b/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-perl/Class-ReturnValue dev-perl/Text-vFile-asData dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Data-ICal-0.22.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=70f8b9263ca88a652a76224bbbb365ea
+_md5_=f47a613e01722d1a934fcdde74d92e28
diff --git a/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.150.0 b/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.150.0
index 70007e92c316..31a08aa8996b 100644
--- a/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.150.0
+++ b/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.150.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Trigger dev-perl/Class-Data-Inheritable dev-perl/Class-Accessor dev-perl/DBI virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIXAPART/Data-ObjectDriver-0.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=03c129585cf11d079e603f888fb3b468
+_md5_=28807698bd9ce214307766c43613c449
diff --git a/metadata/md5-cache/dev-perl/Data-OptList-0.110.0 b/metadata/md5-cache/dev-perl/Data-OptList-0.110.0
index 59fea21b9f0d..14a0814728c4 100644
--- a/metadata/md5-cache/dev-perl/Data-OptList-0.110.0
+++ b/metadata/md5-cache/dev-perl/Data-OptList-0.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sub-Install-0.921.0 dev-perl/Params-Util virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=af186f4c5852fc4118d10ebbbb42e14d
+_md5_=eb73f4693d4bbbc8cf737d9cc50fbb76
diff --git a/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1 b/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
index 73e142ce798e..fcc6ed8f453b 100644
--- a/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor-Chained dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.02.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5f27afeb5bb99599c2a86511c60650f8
+_md5_=27cc28f7e95ee8643a3f412292fd5156
diff --git a/metadata/md5-cache/dev-perl/Data-Page-Pageset-1.20.0-r1 b/metadata/md5-cache/dev-perl/Data-Page-Pageset-1.20.0-r1
index b8950c7165e9..d9f1906c13cd 100644
--- a/metadata/md5-cache/dev-perl/Data-Page-Pageset-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Page-Pageset-1.20.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Data-Page-2.0.0 dev-perl/Class-Accessor dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0a5451af80a91f70166de95ea55385ac
+_md5_=e6789c17af8e1b02d809fec1dcdc3bf4
diff --git a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9 b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9
index a4dbb877f1a7..38227b902fd1 100644
--- a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9
+++ b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc x86 ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Method-Modifiers dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime dev-perl/Role-Tiny virtual/perl-parent dev-perl/strictures dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTP/Data-Perl-0.002009.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc055ed94ca6214bab98b0d5bc6c342b
+_md5_=03b7151618d75b1415c180828f13166b
diff --git a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1 b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
index 01adc977544c..0cb4a22c51f9 100644
--- a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
+++ b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Method-Modifiers dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime dev-perl/Role-Tiny virtual/perl-parent dev-perl/strictures dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTP/Data-Perl-0.002009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ada49cb21e4533976978fdcf74227722
+_md5_=ede139467aa24ffcbe06c304effd8e76
diff --git a/metadata/md5-cache/dev-perl/Data-Random-0.120.0 b/metadata/md5-cache/dev-perl/Data-Random-0.120.0
index 5781763321b8..5a7f270297ab 100644
--- a/metadata/md5-cache/dev-perl/Data-Random-0.120.0
+++ b/metadata/md5-cache/dev-perl/Data-Random-0.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Time-Piece-1.160.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BA/BAREFOOT/Data-Random-0.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0a2f3a7be05f5d98e609e3767403ca15
+_md5_=14cb768166c6af02e9d420585973fb49
diff --git a/metadata/md5-cache/dev-perl/Data-Section-0.200.7 b/metadata/md5-cache/dev-perl/Data-Section-0.200.7
index c7f342dbfe58..10ec928399be 100644
--- a/metadata/md5-cache/dev-perl/Data-Section-0.200.7
+++ b/metadata/md5-cache/dev-perl/Data-Section-0.200.7
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode >=dev-perl/MRO-Compat-0.90.0 >=dev-perl/Sub-Exporter-0.979.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.200007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=28e436b2422f7ad5b9d8d8ac65076e7c
+_md5_=068eb94789c85c8893e2bbfeacb4dae9
diff --git a/metadata/md5-cache/dev-perl/Data-Serializer-0.600.0-r1 b/metadata/md5-cache/dev-perl/Data-Serializer-0.600.0-r1
index 2765fe8c3cce..05b88fbaf8ee 100644
--- a/metadata/md5-cache/dev-perl/Data-Serializer-0.600.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Serializer-0.600.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=virtual/perl-AutoLoader virtual/perl-Data-Dumper virtual/perl-Digest-SHA virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=112320160ff94015b4332744da011ece
+_md5_=19c4dc041236509cdc5399bf0c20d8fa
diff --git a/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1 b/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1
index a02a4dcd1f7a..6dfaaa921450 100644
--- a/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Stream-Bulk-0.110.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose dev-perl/Sub-Exporter dev-perl/Path-Class dev-perl/namespace-clean dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Data-Stream-Bulk-0.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=361cdb27d76465c6e7c9dff615200a1a
+_md5_=47b1137c892c00fe6761353d415d0cfc
diff --git a/metadata/md5-cache/dev-perl/Data-Structure-Util-0.160.0 b/metadata/md5-cache/dev-perl/Data-Structure-Util-0.160.0
index f7d264d97541..f1e80b14442a 100644
--- a/metadata/md5-cache/dev-perl/Data-Structure-Util-0.160.0
+++ b/metadata/md5-cache/dev-perl/Data-Structure-Util-0.160.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 >=virtual/perl-Scalar-List-Utils-1.10.0 virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/Data-Structure-Util-0.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2e068e732fa9a10053d1538b0a0ac133
+_md5_=d91e947b490e371ee544624231e02c0a
diff --git a/metadata/md5-cache/dev-perl/Data-Types-0.90.0 b/metadata/md5-cache/dev-perl/Data-Types-0.90.0
index 48f12f6840b6..78fbdd843cb1 100644
--- a/metadata/md5-cache/dev-perl/Data-Types-0.90.0
+++ b/metadata/md5-cache/dev-perl/Data-Types-0.90.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/Data-Types-0.09.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc1f1d506a299364a8f29e6808f30311
+_md5_=69940e8a07f1c13befe33e487c77ed5b
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0 b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0
index fc83a16eb25f..a32444d67db0 100644
--- a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0
+++ b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-perl/Net-Domain-TLD dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=99dc546ca828560541ad70138f2f8e2e
+_md5_=1bb4518adb49abc60d004f42b1396477
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.140.0 b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.140.0
index 89329f68e496..5f5c8cd70af3 100644
--- a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.140.0
+++ b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter >=dev-perl/Net-Domain-TLD-1.740.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=39f03b941bf285e659311484d58527c7
+_md5_=a3ad5096ccec92887aa1dd8388c5ecf8
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0 b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
index db4f2aada76c..84db0867a2ae 100644
--- a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
+++ b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter >=dev-perl/NetAddr-IP-4 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4de678eab1f0a226fc610327ea126ff1
+_md5_=635fc31415d731daa0fd0c239d929415
diff --git a/metadata/md5-cache/dev-perl/Data-Visitor-0.300.0-r1 b/metadata/md5-cache/dev-perl/Data-Visitor-0.300.0-r1
index 59b3abdcf2b0..6c60757945b2 100644
--- a/metadata/md5-cache/dev-perl/Data-Visitor-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Visitor-0.300.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Load-0.60.0 >=dev-perl/Moose-0.890.0 >=dev-perl/namespace-clean-0.190.0 >=dev-perl/Tie-ToObject-0.01 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Data-Visitor-0.30.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a2cd92f476e7960c80443af41af5ff2
+_md5_=f414b3d96e60efa2a6447638878fae73
diff --git a/metadata/md5-cache/dev-perl/Date-Extract-0.60.0 b/metadata/md5-cache/dev-perl/Date-Extract-0.60.0
index 1fbb1f1a5bda..9ae4ae6c9d0c 100644
--- a/metadata/md5-cache/dev-perl/Date-Extract-0.60.0
+++ b/metadata/md5-cache/dev-perl/Date-Extract-0.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-Data-Inheritable >=dev-perl/DateTime-Format-Natural-0.600.0 virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Date-Extract-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8fdf241b23e5cbc292d48310710319d4
+_md5_=a7e326f1dab17b3ab2e80fe2a0c544b0
diff --git a/metadata/md5-cache/dev-perl/Date-Manip-6.600.0 b/metadata/md5-cache/dev-perl/Date-Manip-6.600.0
index 95286f807af4..27326ec617fe 100644
--- a/metadata/md5-cache/dev-perl/Date-Manip-6.600.0
+++ b/metadata/md5-cache/dev-perl/Date-Manip-6.600.0
@@ -7,7 +7,8 @@ IUSE=elibc_musl test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode virtual/perl-File-Spec virtual/perl-IO virtual/perl-Storable elibc_musl? ( sys-libs/timezone-data ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.60.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7bedadcc1018c1679d35886ece1117e0
+_md5_=800855b0b7345043ddd732e68fa15c94
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.200.0 b/metadata/md5-cache/dev-perl/DateTime-1.200.0
index f44056b5e411..f43d67825739 100644
--- a/metadata/md5-cache/dev-perl/DateTime-1.200.0
+++ b/metadata/md5-cache/dev-perl/DateTime-1.200.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-Locale-0.410.0 >=dev-perl/DateTime-TimeZone-1.740.0 >=dev-perl/Params-Validate-0.760.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.20.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e39114a0a657cc521f515491a524a60
+_md5_=fbaee70091b5751d869b374459e04094
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.210.0 b/metadata/md5-cache/dev-perl/DateTime-1.210.0
index 1f7d73dcb82e..b4117b1a1cf6 100644
--- a/metadata/md5-cache/dev-perl/DateTime-1.210.0
+++ b/metadata/md5-cache/dev-perl/DateTime-1.210.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-Locale-0.410.0 >=dev-perl/DateTime-TimeZone-1.740.0 >=dev-perl/Params-Validate-1.30.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c77b12a6b2443bbd0af9b258ea6bac6d
+_md5_=ffd6b53af5cbff7c56a748feab93a2cf
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.280.0 b/metadata/md5-cache/dev-perl/DateTime-1.280.0
index 0eb13cad2654..8faf8b3b1d91 100644
--- a/metadata/md5-cache/dev-perl/DateTime-1.280.0
+++ b/metadata/md5-cache/dev-perl/DateTime-1.280.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-Locale-0.410.0 >=dev-perl/DateTime-TimeZone-1.740.0 >=dev-perl/Params-Validate-1.30.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.28.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d689464fe5b2f378ba3bd0dfc803ff02
+_md5_=da5046ff4f608eb546b8fab878932fed
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.360.0 b/metadata/md5-cache/dev-perl/DateTime-1.360.0
index 4899c449011e..b16b36db9f12 100644
--- a/metadata/md5-cache/dev-perl/DateTime-1.360.0
+++ b/metadata/md5-cache/dev-perl/DateTime-1.360.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=!<=dev-perl/DateTime-Format-Mail-0.402.0 virtual/perl-Carp >=dev-perl/DateTime-Locale-1.50.0 >=dev-perl/DateTime-TimeZone-2.0.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Params-Validate-1.30.0 virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.180.0 dev-perl/Try-Tiny virtual/perl-XSLoader >=dev-perl/namespace-autoclean-0.190.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.36.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ef0ee9b6f03832b4653c354295aa6e2e
+_md5_=2628e3942eaea0f40c5b74a666f712e4
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.420.0 b/metadata/md5-cache/dev-perl/DateTime-1.420.0
index ae40c3705e0a..46f7e09ccd1a 100644
--- a/metadata/md5-cache/dev-perl/DateTime-1.420.0
+++ b/metadata/md5-cache/dev-perl/DateTime-1.420.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=!<=dev-perl/DateTime-Format-Mail-0.402.0 virtual/perl-Carp >=dev-perl/DateTime-Locale-1.60.0 >=dev-perl/DateTime-TimeZone-2.20.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Params-ValidationCompiler-0.130.0 virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.180.0 dev-perl/Try-Tiny virtual/perl-XSLoader >=dev-perl/namespace-autoclean-0.190.0 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.42.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=faaa433d4ec9a375d56322fbe53bc73b
+_md5_=e95f95ad21cd08c03489f614aa3c7133
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.440.0 b/metadata/md5-cache/dev-perl/DateTime-1.440.0
index d80d844d23d8..1fcb5f3753cc 100644
--- a/metadata/md5-cache/dev-perl/DateTime-1.440.0
+++ b/metadata/md5-cache/dev-perl/DateTime-1.440.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=!<=dev-perl/DateTime-Format-Mail-0.402.0 virtual/perl-Carp >=dev-perl/DateTime-Locale-1.60.0 >=dev-perl/DateTime-TimeZone-2.20.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Params-ValidationCompiler-0.130.0 virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.180.0 dev-perl/Try-Tiny virtual/perl-XSLoader >=dev-perl/namespace-autoclean-0.190.0 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.44.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1e4dcbd69b2aea704e7363be5c054620
+_md5_=f8576e8a3bbe634cb7a84dd359bf4e5e
diff --git a/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.40.0 b/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.40.0
index dea687f87891..735f28eeb3d7 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.40.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.80.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PI/PIJLL/DateTime-Calendar-Julian-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b086f8eacdb9c292982edf83df97db4f
+_md5_=84d2de7e6eb41b433f9975e71cb4fd20
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.280.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.280.0
index 89e57f34b6f7..a3f37ef9ea66 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.280.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.280.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime >=dev-perl/DateTime-Format-Builder-0.740.0 dev-perl/DateTime-TimeZone dev-perl/List-MoreUtils dev-perl/Module-Pluggable dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.28.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e5b14dd4bbf90643dcc88ddabb4b223e
+_md5_=dd7cbb96273ed1d6da33b850ed7825ef
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0 b/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
index 7e2f01f5f5aa..efaf9375c3ab 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.170.0 >=dev-perl/HTTP-Date-1.440.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CK/CKRAS/DateTime-Format-HTTP-0.42.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c12e413d20f3510702c8bfbe4f11d55
+_md5_=f62e09cc2f0d84ea7f725deed353c078
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
index 374bb1ac3e79..a8f3ab35a4f1 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-perl/DateTime-Format-Builder dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2d48258cfbb62a262a06baf1fbdb537
+_md5_=2f09d919d28e9d6805eab7890b6df744
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0
index 48a24270d24f..0dbb5dd25558 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.40.0 dev-perl/Params-Validate dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.403.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2be593704c5ff801042a957bcc30c8ae
+_md5_=f19da5ede5ca7b42572d629d24bbc8c9
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.50.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.50.0
index 4fd900910c9d..d67e6093bb9b 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.50.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Clone dev-perl/Date-Calc dev-perl/DateTime dev-perl/DateTime-TimeZone virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/List-MoreUtils dev-perl/Params-Validate virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Term-ReadLine dev-perl/boolean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=30e1a64dd96cce4a4f1d6b5a2449217c
+_md5_=cd69b2183169920b9b9f9168dfb03f14
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.700.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.700.0
index 7f12f28b23a9..cdd859403615 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.700.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.700.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x64-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1 >=dev-perl/DateTime-Locale-0.450.0 >=dev-perl/DateTime-TimeZone-0.790.0 virtual/perl-Exporter >=dev-perl/Package-DeprecationManager-0.150.0 >=dev-perl/Params-Validate-1.200.0 dev-perl/Try-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.70.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=05508e8569feddd2d4cd48d148e38fb4
+_md5_=9c0dbfc68556f9553529b224c17d2861
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
index 345085ceb4ba..bf67010ef7bc 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1 >=dev-perl/DateTime-Locale-1.50.0 >=dev-perl/DateTime-TimeZone-2.90.0 virtual/perl-Exporter >=dev-perl/Package-DeprecationManager-0.150.0 dev-perl/Params-ValidationCompiler >=dev-perl/Specio-0.330.0 dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.74.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c2c5fe76e76aec60dd4872bd9e1538cd
+_md5_=73d477f5a796164202e2b9f396eeabb0
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.70.0 b/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.70.0
index 04b5cc48ad7e..d8fc83c2645f 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.70.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.70.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e2ea297436a6d3357490021e1c662a78
+_md5_=b30db1c45b61977b6fc2a17446ded12f
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-0.460.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-0.460.0
index 359c7959babb..19920c91523d 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-0.460.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-0.460.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-2 ) unicode
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 dev-perl/List-MoreUtils dev-perl/Params-Validate dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-0.46.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=02666de1e4b71298f5d9c17793ddcbfb
+_md5_=d2e7fe1faf44cb40ac24d3a97a0e57de
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-1.160.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-1.160.0
index 23f0a5110e92..bbd5e7f26f39 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-1.160.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-1.160.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-2+ ) unicode
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/File-ShareDir >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Specio-0.150.0 >=dev-perl/namespace-autoclean-0.190.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7f6227ca257329eeb1c6f83f27d10682
+_md5_=1b87c3f1a05d9440ea5faf9f9a35ae53
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-1.20.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-1.20.0
index c89be4c7e136..9ab06344188e 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-1.20.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-1.20.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-2+ ) unicode
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/List-MoreUtils dev-perl/Params-Validate dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=323a54c4982f18e34e6994fe6d8ad270
+_md5_=d905b343961a8e99a05d7f5ec6e9baf9
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-1.30.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-1.30.0
index 1f788f1ea4d4..ef9cd5ca9b13 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-1.30.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-1.30.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-2+ ) unicode
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/List-MoreUtils dev-perl/Params-Validate dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0a5333addfc0250ae174b554c0603a8f
+_md5_=7d8678f71d04dd7a34ba9ecb5c01f940
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-1.50.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-1.50.0
index ff083faf8999..4ca990289121 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-1.50.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-1.50.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-2+ ) unicode
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/Params-Validate >=virtual/perl-Scalar-List-Utils-1.450.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=07269ec3e08a7996064d56a8e7540969
+_md5_=7d6e09eca99a17e25285107a8f3cb74b
diff --git a/metadata/md5-cache/dev-perl/DateTime-Set-0.390.0 b/metadata/md5-cache/dev-perl/DateTime-Set-0.390.0
index 2ef3fdb1cab7..00705a8053c8 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Set-0.390.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Set-0.390.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.120.0 >=dev-perl/Set-Infinite-0.590.0 dev-perl/Params-Validate dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.3900.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=57bf1bda0a5ed3dbeee9b337b52f5229
+_md5_=74d82073b978fa6fcc0b48894e5c34c9
diff --git a/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.930.0 b/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.930.0
index f7c96509b0f7..3828e75c1cf4 100644
--- a/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.930.0
+++ b/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.930.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Singleton-1.30.0 virtual/perl-File-Spec dev-perl/List-AllUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime >=dev-perl/Params-Validate-0.720.0 dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.93.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e90d33cfe522103c4edbb3fcc37411bf
+_md5_=6309db41fc3eced11121b94d87d2d630
diff --git a/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.940.0 b/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.940.0
index 531441b75d69..6438e000dd9b 100644
--- a/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.940.0
+++ b/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.940.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Singleton-1.30.0 virtual/perl-File-Spec >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Module-Runtime >=dev-perl/Params-Validate-0.720.0 dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.94.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5f945e429bcc508e343b5e306c34e256
+_md5_=9df98f9c6fabdf1b78f7c6fb90988e0f
diff --git a/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.10.0 b/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.10.0
index caa3abce60e6..a4f01570e761 100644
--- a/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.10.0
+++ b/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Singleton-1.30.0 virtual/perl-File-Spec >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Module-Runtime >=dev-perl/Params-Validate-0.720.0 dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bfa77af0d72df4c4b06971cc204d83a4
+_md5_=d66b5fe6e04881fb4f09dc67cc75f579
diff --git a/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.110.0 b/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.110.0
index 4bd8f0ba8b60..ddab5c4cef5f 100644
--- a/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.110.0
+++ b/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Singleton-1.30.0 virtual/perl-File-Spec dev-perl/Module-Runtime >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Specio-0.150.0 dev-perl/Try-Tiny dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f4489778edd4369cbd7baa036037ebe8
+_md5_=db8077001edff8021ba239a1cdfc65c3
diff --git a/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.130.0 b/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.130.0
index 3183e03edea0..98d70c690fa6 100644
--- a/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.130.0
+++ b/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Singleton-1.30.0 virtual/perl-File-Spec dev-perl/Module-Runtime >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Specio-0.150.0 dev-perl/Try-Tiny dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b75957685e71cda1f91fd499a61238db
+_md5_=31f921fe46dea183001d0dba4198a2e8
diff --git a/metadata/md5-cache/dev-perl/DateTime-Tiny-1.60.0 b/metadata/md5-cache/dev-perl/DateTime-Tiny-1.60.0
index c23e4583ab3f..a108dc3b57af 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Tiny-1.60.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Tiny-1.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/DateTime-Tiny-1.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9a0001e100445ce5955c39f1fde15c89
+_md5_=dc102d6d9c25cf42833ffcbc1debddd7
diff --git a/metadata/md5-cache/dev-perl/DateTimeX-Easy-0.89.0 b/metadata/md5-cache/dev-perl/DateTimeX-Easy-0.89.0
index 1de7150dd026..8614f436a39e 100644
--- a/metadata/md5-cache/dev-perl/DateTimeX-Easy-0.89.0
+++ b/metadata/md5-cache/dev-perl/DateTimeX-Easy-0.89.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-perl/TimeDate dev-perl/DateTime-Format-Flexible dev-perl/DateTime-Format-ICal dev-perl/DateTime-Format-Natural virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a8735e66cb744de19f353134740ae82c
+_md5_=716484d4dc2efe2c879d3142a6398ed0
diff --git a/metadata/md5-cache/dev-perl/Debug-Client-0.310.0 b/metadata/md5-cache/dev-perl/Debug-Client-0.310.0
index 6e525cc9400f..5f2ba9a46562 100644
--- a/metadata/md5-cache/dev-perl/Debug-Client-0.310.0
+++ b/metadata/md5-cache/dev-perl/Debug-Client-0.310.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Carp-1.330.100 >=virtual/perl-Exporter-5.700.0 >=virtual/perl-IO-Socket-IP-0.290.0 >=dev-perl/PadWalker-1.980.0 >=virtual/perl-Term-ReadLine-1.140.0 >=dev-perl/Term-ReadLine-Gnu-1.200.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/Debug-Client-0.31.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e5d10aac605e7fc9270d2bf8e9c8a465
+_md5_=820aa1a9fec612ad5e1d8e80eb10394b
diff --git a/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1 b/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1
index fb99f260c216..87455208e94e 100644
--- a/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/PadWalker dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/Devel-ArgNames-0.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=995abb43848968cec6a9e1ce3f4b2c53
+_md5_=2862b9b75d80214cb37990e4b7bfc57b
diff --git a/metadata/md5-cache/dev-perl/Devel-CallChecker-0.8.0 b/metadata/md5-cache/dev-perl/Devel-CallChecker-0.8.0
index b0d8e723e484..cb35c1e70d59 100644
--- a/metadata/md5-cache/dev-perl/Devel-CallChecker-0.8.0
+++ b/metadata/md5-cache/dev-perl/Devel-CallChecker-0.8.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DynaLoader-Functions-0.1.0 virtual/perl-Exporter virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Devel-CallChecker-0.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8117b1ae8483f0fe2e7cf9b56444a20e
+_md5_=bcd86d8a0627cd829841ae9441ebd266
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0 b/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0
index 834975ab114d..3855c857b56c 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.520.0 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=76702e549aacf0eb0b1ccc7433ae2258
+_md5_=252b661e469ec31d1e35cbdb205034ea
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0 b/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
index 434445d3d11c..9ba99a46b9d0 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckCompiler-0.70.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-ExtUtils-CBuilder virtual/perl-File-Temp virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1befb2b8af5560d004c21dc6ed93dbec
+_md5_=9b7fc483c8379037e619c918d7676f3f
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckLib-1.110.0 b/metadata/md5-cache/dev-perl/Devel-CheckLib-1.110.0
index 567b23a4f1ea..478dc512684f 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckLib-1.110.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckLib-1.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Temp-0.160.0 virtual/perl-Exporter virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-1.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7ef095cddfd62632ba5a94c85be304aa
+_md5_=374a3a9180d210452f3521a3086285ac
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckLib-1.130.0 b/metadata/md5-cache/dev-perl/Devel-CheckLib-1.130.0
index 9e3bb945f79b..d4304e6464c9 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckLib-1.130.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckLib-1.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Temp-0.160.0 virtual/perl-Exporter virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-1.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=35751a16b1b75a433b1af3ad6d140260
+_md5_=7a9cbfa8103732eb4fa08a30ea0d0f49
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckOS-1.810.0 b/metadata/md5-cache/dev-perl/Devel-CheckOS-1.810.0
index 6ac8452c1925..177bf9ca603f 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckOS-1.810.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckOS-1.810.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Data-Compare-1.210.0 >=dev-perl/File-Find-Rule-0.280.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.81.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2eac97e9e383639ce110c997be4a4cab
+_md5_=78f194777f7f0c8c65534c7609bb0411
diff --git a/metadata/md5-cache/dev-perl/Devel-Cover-1.290.0-r1 b/metadata/md5-cache/dev-perl/Devel-Cover-1.290.0-r1
index e66a1927e253..c10f6e606344 100644
--- a/metadata/md5-cache/dev-perl/Devel-Cover-1.290.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-Cover-1.290.0-r1
@@ -7,7 +7,8 @@ IUSE=minimal test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/B-Debug virtual/perl-Digest-MD5 virtual/perl-Storable >=dev-perl/HTML-Parser-3.690.0 !minimal? ( dev-perl/Browser-Open dev-perl/Capture-Tiny dev-perl/Class-XSAccessor dev-perl/HTML-Parser >=dev-perl/JSON-MaybeXS-1.3.3 dev-perl/Moo dev-perl/Parallel-Iterator >=dev-perl/Perl-Tidy-20060719.0.0 >=dev-perl/Pod-Coverage-0.220.0 dev-perl/Sereal-Decoder dev-perl/Sereal-Encoder >=dev-perl/PPI-HTML-1.70.0 >=dev-perl/Template-Toolkit-2.0.0 dev-perl/Test-Differences dev-perl/namespace-clean ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJCJ/Devel-Cover-1.29.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=40af4d29c0057181283b3515d32f21b0
+_md5_=d381068b5ce14268814db8bae0b56c96
diff --git a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0 b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
index 31e492185b55..7dc4ed90a0f0 100644
--- a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
+++ b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7219ac50a96e40e1cec4a53d298d5c28
+_md5_=c864f95362bf597f1d4a982d7378a23d
diff --git a/metadata/md5-cache/dev-perl/Devel-Declare-0.6.19 b/metadata/md5-cache/dev-perl/Devel-Declare-0.6.19
index 97ffe25a551b..950a9c17aed1 100644
--- a/metadata/md5-cache/dev-perl/Devel-Declare-0.6.19
+++ b/metadata/md5-cache/dev-perl/Devel-Declare-0.6.19
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.50.0 >=dev-perl/B-Hooks-OP-Check-0.190.0 >=virtual/perl-Scalar-List-Utils-1.110.0 dev-perl/Sub-Name dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006019.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c071683bad8411ebc68c9cc3b2eaea89
+_md5_=65e2becdf53290536c728f695523e5a3
diff --git a/metadata/md5-cache/dev-perl/Devel-FindPerl-0.14.0 b/metadata/md5-cache/dev-perl/Devel-FindPerl-0.14.0
index dc4fe909616f..4764677aba8d 100644
--- a/metadata/md5-cache/dev-perl/Devel-FindPerl-0.14.0
+++ b/metadata/md5-cache/dev-perl/Devel-FindPerl-0.14.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/ExtUtils-Config-0.7.0 ) virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.014.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8b7f93ac9bd0a9133ab0faeb1444154e
+_md5_=02e4a299b5cbfe55b3b6f981d46a44a0
diff --git a/metadata/md5-cache/dev-perl/Devel-GlobalPhase-0.3.3 b/metadata/md5-cache/dev-perl/Devel-GlobalPhase-0.3.3
index 4479b03343b8..becbf909c4a2 100644
--- a/metadata/md5-cache/dev-perl/Devel-GlobalPhase-0.3.3
+++ b/metadata/md5-cache/dev-perl/Devel-GlobalPhase-0.3.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalPhase-0.003003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7c094c9bee83680a247387296c9ea0e0
+_md5_=4b5454183121d53f92e7f2d970a0564f
diff --git a/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900 b/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
index ba105e2fabee..789093fe90cb 100644
--- a/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
+++ b/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv ~s390 ~sh ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0009.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ed89980375b4163cfec6c458207622f
+_md5_=d9e26857a671bd602f6a64047d0a1e70
diff --git a/metadata/md5-cache/dev-perl/Devel-NYTProf-6.40.0 b/metadata/md5-cache/dev-perl/Devel-NYTProf-6.40.0
index f00c65883a4d..e7fc7a939eee 100644
--- a/metadata/md5-cache/dev-perl/Devel-NYTProf-6.40.0
+++ b/metadata/md5-cache/dev-perl/Devel-NYTProf-6.40.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Which-1.90.0 virtual/perl-Getopt-Long dev-perl/JSON-MaybeXS virtual/perl-Scalar-List-Utils virtual/perl-XSLoader sys-libs/zlib dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-6.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=31aebd8b850f72cf9cba8656aa2f9624
+_md5_=3c962ff0d4a338a27dcce0f125a89fc4
diff --git a/metadata/md5-cache/dev-perl/Devel-NYTProf-6.60.0 b/metadata/md5-cache/dev-perl/Devel-NYTProf-6.60.0
index 8e5a21dcf50a..d10fa1f162e0 100644
--- a/metadata/md5-cache/dev-perl/Devel-NYTProf-6.60.0
+++ b/metadata/md5-cache/dev-perl/Devel-NYTProf-6.60.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Which-1.90.0 virtual/perl-Getopt-Long dev-perl/JSON-MaybeXS virtual/perl-Scalar-List-Utils virtual/perl-XSLoader sys-libs/zlib dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-6.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2f5a02426563cdc07c2de9e59c127ea8
+_md5_=cd0f4c0a2b024a49bd6efbdb42e2e309
diff --git a/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.4.0 b/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.4.0
index e8553a31a25b..390cc376724b 100644
--- a/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.4.0
+++ b/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 dev-perl/MRO-Compat >=dev-perl/Package-Stash-0.140.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b9044553f363ea64e2837abcadd5097c
+_md5_=021f45f4e80edf67a50c2e09aeeed6eb
diff --git a/metadata/md5-cache/dev-perl/Devel-REPL-1.3.28 b/metadata/md5-cache/dev-perl/Devel-REPL-1.3.28
index eab2ac8f6f0e..cf06551af92a 100644
--- a/metadata/md5-cache/dev-perl/Devel-REPL-1.3.28
+++ b/metadata/md5-cache/dev-perl/Devel-REPL-1.3.28
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-HomeDir virtual/perl-File-Spec >=virtual/perl-JSON-PP-2.273.0 dev-perl/Module-Runtime >=dev-perl/Moose-0.930.0 >=dev-perl/MooseX-Getopt-0.180.0 >=dev-perl/MooseX-Object-Pluggable-0.0.9 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes dev-perl/namespace-autoclean dev-perl/App-Nopaste dev-perl/B-Keywords >=dev-perl/Data-Dump-Streamer-2.390.0 dev-perl/Data-Dumper-Concise dev-perl/File-Next dev-perl/Lexical-Persistence dev-perl/Module-Refresh dev-perl/PPI dev-perl/Sys-SigAction dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Devel-REPL-1.003028.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c0ddd39cf094929927925944958edbda
+_md5_=fab7e91c5a181f617e78f12271660618
diff --git a/metadata/md5-cache/dev-perl/Devel-SimpleTrace-0.80.0 b/metadata/md5-cache/dev-perl/Devel-SimpleTrace-0.80.0
index 514573e2d51a..2da18508959a 100644
--- a/metadata/md5-cache/dev-perl/Devel-SimpleTrace-0.80.0
+++ b/metadata/md5-cache/dev-perl/Devel-SimpleTrace-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Devel-SimpleTrace-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9d10e10f04f0127281901a63305844e2
+_md5_=bacf7064a9eaa926fb1f3fa4d401358e
diff --git a/metadata/md5-cache/dev-perl/Devel-Size-0.810.0 b/metadata/md5-cache/dev-perl/Devel-Size-0.810.0
index f1c2f1ff8aba..f2fdb5eaccfb 100644
--- a/metadata/md5-cache/dev-perl/Devel-Size-0.810.0
+++ b/metadata/md5-cache/dev-perl/Devel-Size-0.810.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.81.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6c34394fd441724e3028f6c5ff8bddac
+_md5_=0e4b6421df35b21ed949ce192cf74fad
diff --git a/metadata/md5-cache/dev-perl/Devel-Size-0.820.0 b/metadata/md5-cache/dev-perl/Devel-Size-0.820.0
index ed9be67b9532..d442fe87b9e6 100644
--- a/metadata/md5-cache/dev-perl/Devel-Size-0.820.0
+++ b/metadata/md5-cache/dev-perl/Devel-Size-0.820.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.82.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=97f9c42e7939828c1d6037fc54e7e760
+_md5_=496301663f1db5d11b4e00982f9f8f2b
diff --git a/metadata/md5-cache/dev-perl/Devel-StackTrace-2.20.0 b/metadata/md5-cache/dev-perl/Devel-StackTrace-2.20.0
index a68ae6747be0..509117607168 100644
--- a/metadata/md5-cache/dev-perl/Devel-StackTrace-2.20.0
+++ b/metadata/md5-cache/dev-perl/Devel-StackTrace-2.20.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=249031196c8227058a73a62b089a1f10
+_md5_=5d79336f9c5e3d7e691a027e78a87b4e
diff --git a/metadata/md5-cache/dev-perl/Devel-StackTrace-AsHTML-0.150.0 b/metadata/md5-cache/dev-perl/Devel-StackTrace-AsHTML-0.150.0
index 52b899b3d941..b5d7c11501df 100644
--- a/metadata/md5-cache/dev-perl/Devel-StackTrace-AsHTML-0.150.0
+++ b/metadata/md5-cache/dev-perl/Devel-StackTrace-AsHTML-0.150.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Devel-StackTrace dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d55d0e25af395f83b0e43d06c656ef9a
+_md5_=61ecd6e4b5397a033c6f85d7e1ca79cf
diff --git a/metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0 b/metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0
index 3f62c7a9fd29..3e2b2cbc0d88 100644
--- a/metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0
+++ b/metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDK/Devel-Symdump-2.18.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=860cfdb942e660dc30c5a8a3883b8914
+_md5_=0b0d4fc5c2e173b7d52a2adf35e8ab9b
diff --git a/metadata/md5-cache/dev-perl/Digest-GOST-0.60.0-r1 b/metadata/md5-cache/dev-perl/Digest-GOST-0.60.0-r1
index af2b953200ef..2c0d05764793 100644
--- a/metadata/md5-cache/dev-perl/Digest-GOST-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-GOST-0.60.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRAY/Digest-GOST-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=758404a1ce2e11412fba27194c7995ce
+_md5_=75002f7a9802fb2f3d913fa94f40506a
diff --git a/metadata/md5-cache/dev-perl/Digest-JHash-0.100.0 b/metadata/md5-cache/dev-perl/Digest-JHash-0.100.0
index 207d8e9dab84..ef877b33edbb 100644
--- a/metadata/md5-cache/dev-perl/Digest-JHash-0.100.0
+++ b/metadata/md5-cache/dev-perl/Digest-JHash-0.100.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Digest-JHash-0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=eac7066a9140a6952a81d377df6a3e72
+_md5_=4b962f88eed0ed789e392788dc8a954d
diff --git a/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0 b/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0
index 1813f02cb867..929f11acaa3e 100644
--- a/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0
+++ b/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Module-Runtime-0.9.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Dist-CheckConflicts-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7a01c0c904204c634db68d8d75905af8
+_md5_=38a1e06cb7c321375056aabd89789b70
diff --git a/metadata/md5-cache/dev-perl/Dist-Metadata-0.927.0 b/metadata/md5-cache/dev-perl/Dist-Metadata-0.927.0
index fe0f2046d1c6..95b570bde11f 100644
--- a/metadata/md5-cache/dev-perl/Dist-Metadata-0.927.0
+++ b/metadata/md5-cache/dev-perl/Dist-Metadata-0.927.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Archive-Tar-1.0.0 >=dev-perl/Archive-Zip-1.300.0 >=dev-perl/CPAN-DistnameInfo-0.120.0 >=virtual/perl-CPAN-Meta-2.100.0 virtual/perl-Carp >=virtual/perl-Digest-1.30.0 >=virtual/perl-Digest-MD5-2.0.0 >=virtual/perl-Digest-SHA-5.0.0 >=dev-perl/File-Spec-Native-1.2.0 >=virtual/perl-File-Temp-0.190.0 virtual/perl-Module-Metadata >=dev-perl/Path-Class-0.240.0 virtual/perl-Scalar-List-Utils >=dev-perl/Try-Tiny-0.90.0 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RW/RWSTAUNER/Dist-Metadata-0.927.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b07de4987d9a770d6fdbf18828fb0a2d
+_md5_=62af82bccaf39757b6d1573514898b8d
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-6.10.0-r2 b/metadata/md5-cache/dev-perl/Dist-Zilla-6.10.0-r2
index 4a129ff31609..4d670abf465a 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-6.10.0-r2
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-6.10.0-r2
@@ -7,7 +7,8 @@ IUSE=minimal test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Dist-Zilla-Plugin-PromptIfStale-0.40.0 !<=dev-perl/Dist-Zilla-App-Command-update-0.40.0 !<dev-perl/Dist-Zilla-Plugin-CheckExtraTests-0.29.0 !<=dev-perl/Dist-Zilla-PluginBundle-Author-Plicease-2.20.0 !<dev-perl/Dist-Zilla-Plugin-CopyFilesFromBuild-0.161.230 !<=dev-perl/Dist-Zilla-Plugin-CopyFilesFromBuild-Filtered-0.1.0 !<=dev-perl/Dist-Zilla-Plugin-Git-2.36.0 !<=dev-perl/Dist-Zilla-Plugin-Keywords-0.6.0 !<dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.220.0 !<=dev-perl/Dist-Zilla-Plugin-NameFromDirectory-0.30.0 !<=dev-perl/Dist-Zilla-Plugin-PodWeaver-4.6.0 !<=dev-perl/Dist-Zilla-Plugin-Prereqs-AuthorDeps-0.5.0 !<dev-perl/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.161.170 !<=dev-perl/Dist-Zilla-Plugin-Run-0.35.0 !<=dev-perl/Dist-Zilla-Plugin-Test-CheckDeps-0.13.0 !<=dev-perl/Dist-Zilla-Plugin-Test-Version-1.50.0 !<=dev-perl/Dist-Zilla-Plugin-TrialVersionComment-0.3.0 !minimal? ( >=dev-perl/Archive-Tar-Wrapper-0.150.0 >=dev-perl/Data-OptList-0.110.0 dev-perl/Term-ReadLine-Gnu ) >=dev-perl/App-Cmd-0.330.0 virtual/perl-Archive-Tar >=virtual/perl-CPAN-Meta-2.142.60 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=dev-perl/CPAN-Uploader-0.103.4 virtual/perl-Carp >=dev-perl/Class-Load-0.170.0 dev-perl/Config-INI >=dev-perl/Config-MVP-2.200.10 >=dev-perl/Config-MVP-Reader-INI-2.101.461 virtual/perl-Data-Dumper >=dev-perl/Data-Section-0.200.2 >=dev-perl/DateTime-0.440.0 virtual/perl-Digest-MD5 virtual/perl-Encode >=virtual/perl-ExtUtils-Manifest-1.660.0 dev-perl/File-Copy-Recursive dev-perl/File-Find-Rule dev-perl/File-HomeDir virtual/perl-File-Path dev-perl/File-ShareDir >=dev-perl/File-ShareDir-Install-0.30.0 virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-pushd dev-perl/JSON-MaybeXS >=dev-perl/Log-Dispatchouli-1.102.220 >=dev-perl/Mixin-Linewise-0.100.0 virtual/perl-Module-CoreList dev-perl/Module-Runtime >=dev-perl/Moose-0.920.0 dev-perl/MooseX-LazyRequire >=dev-perl/MooseX-Role-Parameterized-1.10.0 dev-perl/MooseX-SetOnce dev-perl/MooseX-Types dev-perl/MooseX-Types-Perl dev-perl/PPI dev-perl/Params-Util >=dev-perl/Path-Tiny-0.52.0 >=dev-perl/Perl-PrereqScanner-1.16.0 >=dev-perl/Pod-Eventual-0.91.480 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Software-License-0.101.370 virtual/perl-Storable >=dev-perl/String-Formatter-0.100.680 >=dev-perl/String-RewritePrefix-0.6.0 dev-perl/Sub-Exporter dev-perl/Sub-Exporter-ForMethods dev-perl/Term-Encoding dev-perl/TermReadKey virtual/perl-Term-ReadLine dev-perl/Term-UI dev-perl/Test-Deep >=dev-perl/Text-Glob-0.80.0 dev-perl/Text-Template dev-perl/Try-Tiny dev-perl/YAML-Tiny virtual/perl-autodie dev-perl/namespace-autoclean virtual/perl-parent virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.010.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6931f36145f49b5e21d1cc2446f392ee
+_md5_=f6b54950f3420c73ba80a43175e77b2f
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Config-Git-0.920.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Config-Git-0.920.0
index c4316f725aae..f10ef30e876d 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Config-Git-0.920.0
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Config-Git-0.920.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Dist-Zilla-1.0.0 >=dev-perl/Moose-0.340.0 >=dev-perl/MooseX-Types-0.60.0 >=dev-perl/String-Errf-0.1.0 >=dev-perl/namespace-clean-0.60.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BB/BBYRD/Dist-Zilla-Plugin-Config-Git-0.92.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1368768a324523c9561fca2cec82031a
+_md5_=1dcdf5821aa76f5bad447e5d65041304
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Git-2.42.0-r1 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Git-2.42.0-r1
index 9ec1d10215ca..fc35c67f1edf 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Git-2.42.0-r1
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Git-2.42.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime >=dev-perl/Dist-Zilla-4.200.16 dev-perl/Dist-Zilla-Plugin-Config-Git >=dev-perl/File-HomeDir-0.810.0 virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-chdir >=dev-perl/Git-Wrapper-0.21.0 dev-perl/IPC-System-Simple >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Module-Runtime dev-perl/Moose dev-perl/MooseX-Has-Sugar dev-perl/MooseX-Types >=dev-perl/MooseX-Types-Path-Tiny-0.10.0 >=dev-perl/Path-Tiny-0.48.0 dev-perl/String-Formatter dev-perl/Try-Tiny dev-perl/Version-Next >=dev-perl/namespace-autoclean-0.90.0 >=virtual/perl-version-0.80.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Git-2.042.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=971495bd5652ef98a4b854bf6d2e3603
+_md5_=b50ebf0ff62a9d0ce800ec778bca6df6
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0
index f9725bd97001..80546a5ff030 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<=dev-perl/Dist-Zilla-Plugin-MakeMaker-Fallback-0.11.0 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=dev-perl/Dist-Zilla-5.1.0 dev-perl/Moose dev-perl/MooseX-Types-Stringlike dev-perl/Path-Tiny >=virtual/perl-Scalar-List-Utils-1.290.0 dev-perl/namespace-autoclean virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-MakeMaker-Awesome-0.39.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fbdb6b7a299f061310078cf04489f754
+_md5_=eb882fc207ffa363c17f6ed92c96e8dc
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MetaProvides-2.2.4 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MetaProvides-2.2.4
index f9faaaad4db9..8a997d6f04aa 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MetaProvides-2.2.4
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MetaProvides-2.2.4
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Dist-Zilla dev-perl/Hash-Merge-Simple dev-perl/Moose dev-perl/MooseX-Types dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/Dist-Zilla-Plugin-MetaProvides-2.002004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=33316ed55b84fd27830143409fe73512
+_md5_=ca6cacefa82dbb9ab903ec137f7c11c2
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MetaProvides-Package-2.4.3 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MetaProvides-Package-2.4.3
index c504e6ef7371..3c02d98cc9f6 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MetaProvides-Package-2.4.3
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MetaProvides-Package-2.4.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Data-Dump-1.160.0 >=dev-perl/Dist-Zilla-5.0.0 >=dev-perl/Dist-Zilla-Plugin-MetaProvides-1.150.0.0 >=dev-perl/Dist-Zilla-Role-ModuleMetadata-0.4.0 dev-perl/Moose dev-perl/MooseX-LazyRequire dev-perl/MooseX-Types dev-perl/PPI dev-perl/Safe-Isa dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/Dist-Zilla-Plugin-MetaProvides-Package-2.004003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e4e417b2663548e23cf96508b061abfa
+_md5_=44612e5e0115b9140436e468f8aa1deb
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OSPrereqs-0.8.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OSPrereqs-0.8.0
index ce3b7e1a943e..6fe3476d9aee 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OSPrereqs-0.8.0
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OSPrereqs-0.8.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Dist-Zilla-5.22.0 dev-perl/Moose >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Dist-Zilla-Plugin-OSPrereqs-0.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4be4b8e2362fbcd35fc8290a4b902e03
+_md5_=673a56c21ebcf9466636c686774d1576
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OurPkgVersion-0.120.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OurPkgVersion-0.120.0
index 47855523406e..9d63facca254 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OurPkgVersion-0.120.0
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OurPkgVersion-0.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Dist-Zilla dev-perl/Moose dev-perl/MooseX-Types-Perl dev-perl/PPI dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Dist-Zilla-Plugin-OurPkgVersion-0.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=72f4ee0eddd39ebff2267b4bb80d5580
+_md5_=ac54252724243ed075eb7b3078fdb435
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-PodWeaver-4.8.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-PodWeaver-4.8.0
index f3fe5154539b..401a30171fd8 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-PodWeaver-4.8.0
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-PodWeaver-4.8.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Dist-Zilla-5.0.0 dev-perl/Moose dev-perl/PPI >=dev-perl/Pod-Elemental-PerlMunger-0.100.0 dev-perl/Pod-Weaver dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-4.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ac8dc1c2ab250ca6a74c1dcae19cca8c
+_md5_=9389a68f5a1fc146997abc23c8809172
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-RPM-0.15.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-RPM-0.15.0
index 75ccc5659de6..2e6a29e181d7 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-RPM-0.15.0
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-RPM-0.15.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Dist-Zilla virtual/perl-File-Temp dev-perl/IPC-Run dev-perl/Moose dev-perl/Moose-Autobox dev-perl/Path-Class dev-perl/Path-Tiny dev-perl/Text-Template dev-perl/namespace-autoclean app-arch/rpm dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SK/SKYSYMBOL/Dist-Zilla-Plugin-RPM-0.015.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8920e79747078462e53a0fce1ecc52ef
+_md5_=c985535fa382810704944faeb3650f78
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver-0.2.300 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver-0.2.300
index fe8b7c973333..fd6703898bc1 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver-0.2.300
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver-0.2.300
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Dist-Zilla-Plugin-PodWeaver dev-perl/Moose dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Dist-Zilla-Plugin-SurgicalPodWeaver-0.0023.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=658a4adbe2d5951896f2ce515d384687
+_md5_=1ab3e61796b3d7ba0dfbaa0374bbac4b
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion-2.0.7 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion-2.0.7
index 66ec7f8c5670..80cab1ca967a 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion-2.0.7
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion-2.0.7
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Dist-Zilla-4.0.0 dev-perl/Moose dev-perl/Test-MinimumVersion dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-MinimumVersion-2.000007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ec238e245eb07c6de1b82bf54133c924
+_md5_=f97d56f840160b96254178819bca4b08
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic-3.1.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic-3.1.0
index 1aa125fc264f..2d463724a788 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic-3.1.0
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic-3.1.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Data-Section-0.4.0 dev-perl/Dist-Zilla dev-perl/Moose dev-perl/Sub-Exporter-ForMethods dev-perl/Test-Perl-Critic dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Perl-Critic-3.001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6e68141497da15ab217349fc18f72638
+_md5_=a21f9e453fc81f204b2f50e8bf9e146a
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Role-ModuleMetadata-0.4.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Role-ModuleMetadata-0.4.0
index d5aaa8975643..607ccb0b68cf 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Role-ModuleMetadata-0.4.0
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Role-ModuleMetadata-0.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 >=virtual/perl-Module-Metadata-1.0.22 dev-perl/Moose dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Role-ModuleMetadata-0.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4d5be4c18b1990bc2af0a19b92d8b0d1
+_md5_=34e723f3c1883f95626ab55ad4f9c759
diff --git a/metadata/md5-cache/dev-perl/Dumbbench-0.111.0 b/metadata/md5-cache/dev-perl/Dumbbench-0.111.0
index 005f90ed358e..6765fd3be84e 100644
--- a/metadata/md5-cache/dev-perl/Dumbbench-0.111.0
+++ b/metadata/md5-cache/dev-perl/Dumbbench-0.111.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny virtual/perl-Carp >=dev-perl/Class-XSAccessor-1.50.0 dev-perl/Devel-CheckOS >=dev-perl/Number-WithError-1.0.0 dev-perl/Params-Util dev-perl/Statistics-CaseResampling virtual/perl-Time-HiRes virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.111.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9ed290ad18a01ae1de9b11653bc39307
+_md5_=dae2da34b29a36874f79b15d0a59dfd4
diff --git a/metadata/md5-cache/dev-perl/DynaLoader-Functions-0.3.0 b/metadata/md5-cache/dev-perl/DynaLoader-Functions-0.3.0
index 16db5524af53..bc666f679b5b 100644
--- a/metadata/md5-cache/dev-perl/DynaLoader-Functions-0.3.0
+++ b/metadata/md5-cache/dev-perl/DynaLoader-Functions-0.3.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/DynaLoader-Functions-0.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d9024f68f3d31b7e65ecc21955135c02
+_md5_=5b8aa4791837e0f185743c14e0f17b61
diff --git a/metadata/md5-cache/dev-perl/Email-Abstract-3.8.0 b/metadata/md5-cache/dev-perl/Email-Abstract-3.8.0
index 6e323f88f487..5cac9a05c7c4 100644
--- a/metadata/md5-cache/dev-perl/Email-Abstract-3.8.0
+++ b/metadata/md5-cache/dev-perl/Email-Abstract-3.8.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~mips ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Simple-1.998 dev-perl/MRO-Compat >=dev-perl/Module-Pluggable-1.500.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dea43f8c93eddd34d56a0fe8f08b2da0
+_md5_=557d8a2ad982aea81a6a3a9ae41a5d67
diff --git a/metadata/md5-cache/dev-perl/Email-Address-1.908.0 b/metadata/md5-cache/dev-perl/Email-Address-1.908.0
index fe5621be90b2..d49d8839ad0e 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-1.908.0
+++ b/metadata/md5-cache/dev-perl/Email-Address-1.908.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.908.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b44f166d3adb4c6fdb67ee1112aa4093
+_md5_=70a5a6b3c7b91a9143c970a06cc9f99f
diff --git a/metadata/md5-cache/dev-perl/Email-Address-1.912.0 b/metadata/md5-cache/dev-perl/Email-Address-1.912.0
index 37f99d4c8fc8..195ffa7e6767 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-1.912.0
+++ b/metadata/md5-cache/dev-perl/Email-Address-1.912.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3bf616b7f0c2a9aab9d27b94136d1039
+_md5_=7d2d69419dd630e8623e67b55cf57787
diff --git a/metadata/md5-cache/dev-perl/Email-Address-List-0.50.0 b/metadata/md5-cache/dev-perl/Email-Address-List-0.50.0
index b47b466531cc..5e6fc454af17 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-List-0.50.0
+++ b/metadata/md5-cache/dev-perl/Email-Address-List-0.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Email-Address-List-0.05.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f00751a440b24f60541aaa702c75f86c
+_md5_=cc6dc708bfadba8a7f70b2fc94a8982e
diff --git a/metadata/md5-cache/dev-perl/Email-Address-List-0.60.0 b/metadata/md5-cache/dev-perl/Email-Address-List-0.60.0
index 3fe9337ec9f8..636c4d92a066 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-List-0.60.0
+++ b/metadata/md5-cache/dev-perl/Email-Address-List-0.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=Artistic-2
 RDEPEND=dev-perl/Email-Address dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPS/Email-Address-List-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4c6962a6f4a70ab82ce81d32cee5b5e8
+_md5_=00255b7b5bafc59f5af1fcf1b0f0e27b
diff --git a/metadata/md5-cache/dev-perl/Email-Address-XS-1.10.0 b/metadata/md5-cache/dev-perl/Email-Address-XS-1.10.0
index 9addb389f6a9..2dbefc4298cc 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-XS-1.10.0
+++ b/metadata/md5-cache/dev-perl/Email-Address-XS-1.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4087079aa93d4778000ce2d1828b6659
+_md5_=259be2b39d4ace1d76f27a37f41c7757
diff --git a/metadata/md5-cache/dev-perl/Email-Date-1.104.0-r2 b/metadata/md5-cache/dev-perl/Email-Date-1.104.0-r2
index 049fab9423ee..2f46c130da26 100644
--- a/metadata/md5-cache/dev-perl/Email-Date-1.104.0-r2
+++ b/metadata/md5-cache/dev-perl/Email-Date-1.104.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/TimeDate-1.16 >=dev-perl/Email-Abstract-2.13.1 >=dev-perl/Email-Date-Format-1.0.0 >=virtual/perl-Time-Piece-1.80.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-1.104.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f4322b7a702cc8f6bf07e16728cd3f77
+_md5_=4349519ef693d214cefdd0ca5aad9144
diff --git a/metadata/md5-cache/dev-perl/Email-Date-Format-1.5.0 b/metadata/md5-cache/dev-perl/Email-Date-Format-1.5.0
index 676bfa98f5ee..1f584058beaf 100644
--- a/metadata/md5-cache/dev-perl/Email-Date-Format-1.5.0
+++ b/metadata/md5-cache/dev-perl/Email-Date-Format-1.5.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-Time-Local dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9e1de1cb1d01ba77d3c813a57bd6c2df
+_md5_=34aafb171c4aea8133d27be5111d4066
diff --git a/metadata/md5-cache/dev-perl/Email-Filter-1.34.0 b/metadata/md5-cache/dev-perl/Email-Filter-1.34.0
index ab28875c699d..47a78e50ddf6 100644
--- a/metadata/md5-cache/dev-perl/Email-Filter-1.34.0
+++ b/metadata/md5-cache/dev-perl/Email-Filter-1.34.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Trigger dev-perl/Email-LocalDelivery dev-perl/Email-Simple dev-perl/IPC-Run dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Filter-1.034.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a3c3d8bf7cb19852219862b14bc5fcb3
+_md5_=c5d8e68f7c35314d76ebba1691627fb4
diff --git a/metadata/md5-cache/dev-perl/Email-FolderType-0.814.0-r1 b/metadata/md5-cache/dev-perl/Email-FolderType-0.814.0-r1
index 46a28cfcd395..852de376ad05 100644
--- a/metadata/md5-cache/dev-perl/Email-FolderType-0.814.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-FolderType-0.814.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 dev-perl/Module-Pluggable dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-FolderType-0.814.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8798389bf5a48832076c3574f943d46a
+_md5_=1243ca0e876bf549ee1a3d49f79bc881
diff --git a/metadata/md5-cache/dev-perl/Email-LocalDelivery-1.200.0-r2 b/metadata/md5-cache/dev-perl/Email-LocalDelivery-1.200.0-r2
index a2987fe779c6..1c8dca2d3815 100644
--- a/metadata/md5-cache/dev-perl/Email-LocalDelivery-1.200.0-r2
+++ b/metadata/md5-cache/dev-perl/Email-LocalDelivery-1.200.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Simple-1.998.0 >=dev-perl/Email-FolderType-0.700.0 virtual/perl-File-Path >=dev-perl/File-Path-Expand-1.10.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-LocalDelivery-1.200.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a30dd02700998990b39a2d52eb0221e9
+_md5_=7f2eaac439fb638fe99730ef5a2741ab
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-1.940.0 b/metadata/md5-cache/dev-perl/Email-MIME-1.940.0
index 95eae2491258..25d33f203788 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-1.940.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-1.940.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Email-Address >=dev-perl/Email-MIME-ContentType-1.16.0 >=dev-perl/Email-MIME-Encodings-1.314.0 dev-perl/Email-MessageID >=dev-perl/Email-Simple-2.206.0 >=virtual/perl-Encode-1.980.100 virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.130.0 virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.940.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1ce0544cee6f36031512031e6dd5e0cf
+_md5_=699eb1f07020b14dd9d2a4f591365d68
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-1.946.0 b/metadata/md5-cache/dev-perl/Email-MIME-1.946.0
index a900659dcef0..0ea4d95961c6 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-1.946.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-1.946.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Email-Address-XS >=dev-perl/Email-MIME-ContentType-1.22.0 >=dev-perl/Email-MIME-Encodings-1.314.0 dev-perl/Email-MessageID >=dev-perl/Email-Simple-2.212.0 >=virtual/perl-Encode-1.980.100 virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.130.0 dev-perl/Module-Runtime virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.946.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e216b6dd476582fe0ebe29a790e3dc70
+_md5_=39df6fc0ca5855f6b915e5f05b998d24
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1 b/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
index a15658d42d15..63293497b3ef 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/Email-MIME-1.900 >=dev-perl/Email-MIME-ContentType-1.012 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Attachment-Stripper-1.317.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e07ca1b0251ce228d1fe17a6e0dae430
+_md5_=7bfbe38d54bd76fa239219cef37b89df
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.18.0 b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.18.0
index 98552c6bbb0c..aa83217fbd78 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.18.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.18.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.018.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=69ae1e7c86a0652b8e1398d8b0b16c02
+_md5_=10289b1e39687da022f7b645d6bf1e19
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.22.0 b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.22.0
index 5b0651ac3006..059338bdaf6e 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.22.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.22.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.870.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.022.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fec77d2304de857e91b81c4ac8ce5eda
+_md5_=fe8547b951ad9af25655bd257d42344d
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1 b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
index d489065a11f4..cc5d195b8a6e 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-3.07 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b006ab285552526b9dcfa4572a851e0
+_md5_=a9e609c6791d8f34b5abde9948c2b2f7
diff --git a/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0 b/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0
index 794cbf31d16a..ec9aaf24f31e 100644
--- a/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0
+++ b/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=25c2bb96d80bd8d60909b403ce166f8a
+_md5_=026c477e4bba9c44bc70f0912acd8829
diff --git a/metadata/md5-cache/dev-perl/Email-Reply-1.204.0 b/metadata/md5-cache/dev-perl/Email-Reply-1.204.0
index 33f897e3a499..07aca36f55bc 100644
--- a/metadata/md5-cache/dev-perl/Email-Reply-1.204.0
+++ b/metadata/md5-cache/dev-perl/Email-Reply-1.204.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Email-Abstract-2.10.0 >=dev-perl/Email-Address-1.800.0 >=dev-perl/Email-MIME-1.820.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Reply-1.204.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=575e906f1d24c1588a6f5345fa100cfe
+_md5_=f8e876b68942acf56d755bae1ad98176
diff --git a/metadata/md5-cache/dev-perl/Email-Send-2.201.0 b/metadata/md5-cache/dev-perl/Email-Send-2.201.0
index 22f116bdb3fd..b5fdb1fffbd1 100644
--- a/metadata/md5-cache/dev-perl/Email-Send-2.201.0
+++ b/metadata/md5-cache/dev-perl/Email-Send-2.201.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~mips ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Email-Abstract >=dev-perl/Email-Address-1.800.0 >=dev-perl/Email-Simple-1.920.0 virtual/perl-File-Spec >=dev-perl/Module-Pluggable-2.970.0 dev-perl/Return-Value >=virtual/perl-Scalar-List-Utils-1.20.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.201.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e258f493ae9cd99c27887e092a3db3b8
+_md5_=4651d654e7572a12c09cb5def94a8280
diff --git a/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0 b/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
index 726a7b05cdfe..499be8c9dc11 100644
--- a/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
+++ b/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~mips x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Authen-SASL dev-perl/Email-Address dev-perl/Email-Send dev-perl/Net-SMTP-SSL dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Email-Send-Gmail-0.33.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f38b801edd957f16437f05a4cb77660e
+_md5_=1458ba206baf01eaa834303589e71bea
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-1.300.16 b/metadata/md5-cache/dev-perl/Email-Sender-1.300.16
index 8e6530f27959..b8141799ea4b 100644
--- a/metadata/md5-cache/dev-perl/Email-Sender-1.300.16
+++ b/metadata/md5-cache/dev-perl/Email-Sender-1.300.16
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Abstract-3.6.0 dev-perl/Email-Address >=dev-perl/Email-Simple-1.998.0 >=virtual/perl-File-Path-2.60.0 virtual/perl-File-Spec virtual/perl-IO dev-perl/List-MoreUtils dev-perl/Module-Runtime >=dev-perl/Moo-1.0.8 >=dev-perl/MooX-Types-MooseLike-0.150.0 virtual/perl-libnet dev-perl/Net-SMTP-SSL virtual/perl-Scalar-List-Utils dev-perl/Sub-Exporter >=dev-perl/Throwable-0.200.3 dev-perl/Try-Tiny dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300016.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3c075f9864c86618d67f7b686c104fe
+_md5_=00f598ebbdafecf4c306fe9f77eb7d05
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-1.300.30-r1 b/metadata/md5-cache/dev-perl/Email-Sender-1.300.30-r1
index fbb098709983..ff7f994b6bcf 100644
--- a/metadata/md5-cache/dev-perl/Email-Sender-1.300.30-r1
+++ b/metadata/md5-cache/dev-perl/Email-Sender-1.300.30-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Abstract-3.6.0 dev-perl/Email-Address >=dev-perl/Email-Simple-1.998.0 >=virtual/perl-File-Path-2.60.0 virtual/perl-File-Spec >=virtual/perl-IO-1.110.0 dev-perl/Module-Runtime >=dev-perl/Moo-2.0.0 >=dev-perl/MooX-Types-MooseLike-0.150.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Sub-Exporter >=dev-perl/Throwable-0.200.3 dev-perl/Try-Tiny >=virtual/perl-libnet-3.70.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300030.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6d0bd5ba7866ab395a85b05f6e0eb42a
+_md5_=982c90033a99c5a9ac09489471f476f4
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-1.300.31-r1 b/metadata/md5-cache/dev-perl/Email-Sender-1.300.31-r1
index 3426841af7cf..30cbb3b7da4e 100644
--- a/metadata/md5-cache/dev-perl/Email-Sender-1.300.31-r1
+++ b/metadata/md5-cache/dev-perl/Email-Sender-1.300.31-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Abstract-3.6.0 dev-perl/Email-Address >=dev-perl/Email-Simple-1.998.0 >=virtual/perl-File-Path-2.60.0 virtual/perl-File-Spec >=virtual/perl-IO-1.110.0 dev-perl/Module-Runtime >=dev-perl/Moo-2.0.0 >=dev-perl/MooX-Types-MooseLike-0.150.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Sub-Exporter >=dev-perl/Throwable-0.200.3 dev-perl/Try-Tiny >=virtual/perl-libnet-3.70.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300031.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=992bd6020582b90c1f13671d1310ef08
+_md5_=e0997d46e730779e8ac1406c8047f567
diff --git a/metadata/md5-cache/dev-perl/Email-Simple-2.214.0 b/metadata/md5-cache/dev-perl/Email-Simple-2.214.0
index 055878b9fe1a..6c1739af2cba 100644
--- a/metadata/md5-cache/dev-perl/Email-Simple-2.214.0
+++ b/metadata/md5-cache/dev-perl/Email-Simple-2.214.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~mips ppc ppc64 x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Email-Date-Format dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.214.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=116d8888ab5ec5a17eba769ea6e55b1d
+_md5_=bc7e1adc13efb47c10dbb25e74fa0d8d
diff --git a/metadata/md5-cache/dev-perl/Email-Valid-1.202.0 b/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
index 1d1719deaae7..0dd996b59ee6 100644
--- a/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
+++ b/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-perl/IO-CaptureOutput virtual/perl-IO dev-perl/MailTools dev-perl/Net-DNS >=dev-perl/Net-Domain-TLD-1.650.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=72a59b1fbf3ff0a7fbb2ea90edb6e76c
+_md5_=1d2e2cb47223c3e2eab7429a05380deb
diff --git a/metadata/md5-cache/dev-perl/Encode-IMAPUTF7-1.50.0-r1 b/metadata/md5-cache/dev-perl/Encode-IMAPUTF7-1.50.0-r1
index 57d66ca10e3e..0953d514cf31 100644
--- a/metadata/md5-cache/dev-perl/Encode-IMAPUTF7-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Encode-IMAPUTF7-1.50.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMAKHOLM/Encode-IMAPUTF7-1.05.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=adb035ff8adf188256b980c3773f4769
+_md5_=e8fa369a7c23a741d6cec10ea057a7b8
diff --git a/metadata/md5-cache/dev-perl/Encode-Locale-1.50.0 b/metadata/md5-cache/dev-perl/Encode-Locale-1.50.0
index e106ce07a465..413057e8fa35 100644
--- a/metadata/md5-cache/dev-perl/Encode-Locale-1.50.0
+++ b/metadata/md5-cache/dev-perl/Encode-Locale-1.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Encode-2.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e3c8cf2206f67bb525afad407067cb72
+_md5_=5614696b322a002e53578ebf61cfe9f7
diff --git a/metadata/md5-cache/dev-perl/Error-0.170.240 b/metadata/md5-cache/dev-perl/Error-0.170.240
index d7660c9bb044..e68dac08dbea 100644
--- a/metadata/md5-cache/dev-perl/Error-0.170.240
+++ b/metadata/md5-cache/dev-perl/Error-0.170.240
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ ) MIT
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17024.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c478db155215ab2dfab605c78cc32293
+_md5_=10df92f8b65cd77cc992caaa5fa3faac
diff --git a/metadata/md5-cache/dev-perl/Error-0.170.250 b/metadata/md5-cache/dev-perl/Error-0.170.250
index e823000fa2e6..cfd2d5a8019a 100644
--- a/metadata/md5-cache/dev-perl/Error-0.170.250
+++ b/metadata/md5-cache/dev-perl/Error-0.170.250
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ ) MIT
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17025.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=84ea97b281320d0e3da945e45daea062
+_md5_=65329ff018bd677970b7cd3addb70ea4
diff --git a/metadata/md5-cache/dev-perl/Eval-Closure-0.130.0 b/metadata/md5-cache/dev-perl/Eval-Closure-0.130.0
index 686263031f01..aaae2a52e6fa 100644
--- a/metadata/md5-cache/dev-perl/Eval-Closure-0.130.0
+++ b/metadata/md5-cache/dev-perl/Eval-Closure-0.130.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~alpha amd64 ~arm hppa ppc x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny !minimal? ( >=dev-perl/Devel-LexAlias-0.50.0 dev-perl/Perl-Tidy ) dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=377316d06ec961531e1674435a4ac3bd
+_md5_=ccd3f24344ea5915ae4917b6a9b05e27
diff --git a/metadata/md5-cache/dev-perl/Eval-Closure-0.140.0 b/metadata/md5-cache/dev-perl/Eval-Closure-0.140.0
index bebbbed513fa..1c97250ec9dc 100644
--- a/metadata/md5-cache/dev-perl/Eval-Closure-0.140.0
+++ b/metadata/md5-cache/dev-perl/Eval-Closure-0.140.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny !minimal? ( >=dev-perl/Devel-LexAlias-0.50.0 dev-perl/Perl-Tidy ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d88c4c63e660184dd629ada5afb42007
+_md5_=5fcb5744830b492cb60ccc63b2abc9bd
diff --git a/metadata/md5-cache/dev-perl/Event-1.260.0 b/metadata/md5-cache/dev-perl/Event-1.260.0
index 35fb19dfd6e7..e6c2bcec8f76 100644
--- a/metadata/md5-cache/dev-perl/Event-1.260.0
+++ b/metadata/md5-cache/dev-perl/Event-1.260.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/Event-1.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6c138975a7958b97294d5c2598d02053
+_md5_=9cb9d4800f62b2761f3f848fea8da8c0
diff --git a/metadata/md5-cache/dev-perl/Event-RPC-1.100.0 b/metadata/md5-cache/dev-perl/Event-RPC-1.100.0
index 265d4affb664..982b6228fff1 100644
--- a/metadata/md5-cache/dev-perl/Event-RPC-1.100.0
+++ b/metadata/md5-cache/dev-perl/Event-RPC-1.100.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=|| ( dev-perl/Event dev-perl/glib-perl dev-perl/AnyEvent ) dev-perl/IO-Socket-SSL dev-perl/Net-SSLeay || ( >=dev-perl/Sereal-3.0.0 dev-perl/CBOR-XS >=dev-perl/JSON-XS-3.0.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRED/Event-RPC-1.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=932b1b0d03c23e67a3ea780f8d37e8ed
+_md5_=f5376849fc7d478da2417fbc3d1ca693
diff --git a/metadata/md5-cache/dev-perl/Event-RPC-1.80.0 b/metadata/md5-cache/dev-perl/Event-RPC-1.80.0
index afb07a5b4aeb..62c9499129b2 100644
--- a/metadata/md5-cache/dev-perl/Event-RPC-1.80.0
+++ b/metadata/md5-cache/dev-perl/Event-RPC-1.80.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ia64 ppc ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=|| ( dev-perl/Event dev-perl/glib-perl dev-perl/AnyEvent ) dev-perl/IO-Socket-SSL dev-perl/Net-SSLeay || ( >=dev-perl/Sereal-3.0.0 dev-perl/CBOR-XS >=dev-perl/JSON-XS-3.0.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRED/Event-RPC-1.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=64ac201d4dffb79332e63fee88200f2b
+_md5_=c7ae94efdb5bfb1da907ebf896fa74e4
diff --git a/metadata/md5-cache/dev-perl/Exception-Base-0.250.100 b/metadata/md5-cache/dev-perl/Exception-Base-0.250.100
index 3719abce3047..1472b203658e 100644
--- a/metadata/md5-cache/dev-perl/Exception-Base-0.250.100
+++ b/metadata/md5-cache/dev-perl/Exception-Base-0.250.100
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.2501.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f26f3f1f53c68dfa7a9b2b99799dc204
+_md5_=0b007e643956d4982a01421fd7ac6ef3
diff --git a/metadata/md5-cache/dev-perl/Exception-Class-1.430.0 b/metadata/md5-cache/dev-perl/Exception-Class-1.430.0
index 2ee7c8517b3b..48c66b4ed9e0 100644
--- a/metadata/md5-cache/dev-perl/Exception-Class-1.430.0
+++ b/metadata/md5-cache/dev-perl/Exception-Class-1.430.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-2.0.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.43.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=df4f19fa99315e2855b9f0ee58ad9ed8
+_md5_=7ca95322e6b3bb921d93ec1e44c3e844
diff --git a/metadata/md5-cache/dev-perl/Exception-Died-0.60.0-r2 b/metadata/md5-cache/dev-perl/Exception-Died-0.60.0-r2
index 9024809768f1..65baffe6f5a0 100644
--- a/metadata/md5-cache/dev-perl/Exception-Died-0.60.0-r2
+++ b/metadata/md5-cache/dev-perl/Exception-Died-0.60.0-r2
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/constant-boolean >=dev-perl/Exception-Base-0.210.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Exception-Died-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d0f0f9afe4ef29c8ca9c3c2f5c915efb
+_md5_=7464e371ee6cfb8f5375c513df4296bd
diff --git a/metadata/md5-cache/dev-perl/Exception-System-0.110.0-r1 b/metadata/md5-cache/dev-perl/Exception-System-0.110.0-r1
index bf5e2766a854..91ddf27a0cc0 100644
--- a/metadata/md5-cache/dev-perl/Exception-System-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Exception-System-0.110.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Exception-Base-0.22.01 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Exception-System-0.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1e3026137feb13f45379e3b4a77a7a3
+_md5_=c4d90a69bac687c3fcc78193fbd967ac
diff --git a/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1 b/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1
index afc78dff4c57..2c0eda5aaa2e 100644
--- a/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1
+++ b/metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Exception-Base-0.22.01 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Exception-Warning-0.0401.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b366cc62017d46c4df3d00c015640e2e
+_md5_=a712d2bca90949b75090f82cd3fc3aca
diff --git a/metadata/md5-cache/dev-perl/Expect-1.350.0 b/metadata/md5-cache/dev-perl/Expect-1.350.0
index c4e8bc5c5895..0d183f48b63d 100644
--- a/metadata/md5-cache/dev-perl/Expect-1.350.0
+++ b/metadata/md5-cache/dev-perl/Expect-1.350.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-IO >=dev-perl/IO-Tty-1.110.0 !minimal? ( dev-perl/IO-Stty ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JACOBY/Expect-1.35.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b4bc515ecc372b10657fcab531e546ed
+_md5_=7aae3abfefd1a65734570da96113befe
diff --git a/metadata/md5-cache/dev-perl/Exporter-Lite-0.80.0 b/metadata/md5-cache/dev-perl/Exporter-Lite-0.80.0
index 18bdf2f5593b..627575d6a34a 100644
--- a/metadata/md5-cache/dev-perl/Exporter-Lite-0.80.0
+++ b/metadata/md5-cache/dev-perl/Exporter-Lite-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ia64 ~mips ppc sparc x86 ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ed58b12104312477a0c60a8590e14a5b
+_md5_=06f54e9efe68dd871befd445bb36ee52
diff --git a/metadata/md5-cache/dev-perl/Exporter-Tiny-1.2.1 b/metadata/md5-cache/dev-perl/Exporter-Tiny-1.2.1
index 63ee54d4c792..049891da324c 100644
--- a/metadata/md5-cache/dev-perl/Exporter-Tiny-1.2.1
+++ b/metadata/md5-cache/dev-perl/Exporter-Tiny-1.2.1
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2e25f1595ab1d16f98f97d45e09a8e0b
+_md5_=50bd8fb3e2309fca32d83326baa71cfb
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-CChecker-0.100.0 b/metadata/md5-cache/dev-perl/ExtUtils-CChecker-0.100.0
index f84c9a4fdf10..c5271611c54f 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-CChecker-0.100.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-CChecker-0.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-ExtUtils-CBuilder dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e4343f2004d94152107ac50cf224e511
+_md5_=f13a63704ad42e967245025d2bc2bd49
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0 b/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0
index 19fa412e2ed8..24f452152291 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.30 virtual/perl-Data-Dumper dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.007.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45440725393411872c8b0e8c1965849b
+_md5_=7abd67e6b8dfbcc977c01c0d6463e9c7
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Config-0.8.0 b/metadata/md5-cache/dev-perl/ExtUtils-Config-0.8.0
index c67f3fef452c..c65d4c46cbfc 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Config-0.8.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Config-0.8.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=871395c18f205b96abf2c09cf3a5e37a
+_md5_=54dc2a4c7b34c51d1b0ebf63b9c2be06
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.110.0 b/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.110.0
index bc88044e3ee9..4d7a665f0243 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.110.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVIDO/ExtUtils-CppGuess-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bf62462dd23a24a69c6c38590b6d423f
+_md5_=3e4fc367a7aa9045bdcb1f44a0c61617
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.405.0 b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.405.0
index 11516860dc63..283ac69e2122 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.405.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.405.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.405.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=284fd039ecaa5eba18c76409f34a6071
+_md5_=442dad06bb55b83d9b663769d132a51f
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0 b/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0
index 9ee2546352b3..1074a25267e8 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec >=virtual/perl-Text-ParseWords-3.240.0 virtual/perl-Module-Load dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.022.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f646b41204158ca007d5cbc48a1d3fed
+_md5_=10e3d3b4dc21306d158ff69a334df6b0
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.26.0 b/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.26.0
index 1a81ba60227e..076caa6494c2 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.26.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.26.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec >=virtual/perl-Text-ParseWords-3.240.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.026.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=11f3bbc6a2feeeb62ae3833b6909cb96
+_md5_=6e79938f2bb8f8c6b24ead0e8bceedce
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0 b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0
index 2d6c0b798125..f3133c69ed7d 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=dev-perl/ExtUtils-Config-0.2.0 virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.010.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=49894de5a51bd93c3b366d3edff9ab14
+_md5_=17d2a996dcad9bc806b30dfac3985d35
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.11.0 b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.11.0
index befc1c0044d1..67d2f9528b04 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.11.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.11.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/ExtUtils-Config-0.2.0 virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.011.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ee0d5828ae716e50bb53b1648e50da17
+_md5_=e895eaf7a7c1ef2fc91dd0b10ff42f29
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-LibBuilder-0.80.0 b/metadata/md5-cache/dev-perl/ExtUtils-LibBuilder-0.80.0
index c563c531e47e..3596a2d7f63b 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-LibBuilder-0.80.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-LibBuilder-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-ExtUtils-CBuilder-0.230.0 virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-LibBuilder-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f50755d30e5fd47d080fcf6a5bbac06a
+_md5_=060d71c9335757e31c047756a03d15e5
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Typemaps-Default-1.50.0 b/metadata/md5-cache/dev-perl/ExtUtils-Typemaps-Default-1.50.0
index 8602527cb0b2..e9efdb78cf1a 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Typemaps-Default-1.50.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Typemaps-Default-1.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-ExtUtils-ParseXS-3.180.300 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemaps-Default-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6097a35852815035d626979efc1c695a
+_md5_=550ead3030f731a32a3f23c6b598b9cd
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0 b/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
index e2e0d898ccc9..808ae0678491 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Digest-MD5-2.0.0 >=virtual/perl-ExtUtils-ParseXS-3.70.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.18.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eeaa2c111d7a6a4cf9d015a7453a9357
+_md5_=731d7e09870ea5e6a7a4521660b8afb8
diff --git a/metadata/md5-cache/dev-perl/FFI-CheckLib-0.250.0 b/metadata/md5-cache/dev-perl/FFI-CheckLib-0.250.0
index 2a0079c16690..925e4f5a2f4e 100644
--- a/metadata/md5-cache/dev-perl/FFI-CheckLib-0.250.0
+++ b/metadata/md5-cache/dev-perl/FFI-CheckLib-0.250.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Module-Load dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.25.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f7115c9774950281b43dd730e6013d0d
+_md5_=b9c30a3153bd18920f960aea014e47c4
diff --git a/metadata/md5-cache/dev-perl/Fatal-Exception-0.50.0-r2 b/metadata/md5-cache/dev-perl/Fatal-Exception-0.50.0-r2
index db08c4381674..15b6bbcadd77 100644
--- a/metadata/md5-cache/dev-perl/Fatal-Exception-0.50.0-r2
+++ b/metadata/md5-cache/dev-perl/Fatal-Exception-0.50.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Exception-Died >=dev-perl/Exception-Base-0.22.01 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=814c94ccbc687b2ad53549d855d0a54c
+_md5_=918dd21fe7545feeeba705f58559dd41
diff --git a/metadata/md5-cache/dev-perl/File-BOM-0.160.0 b/metadata/md5-cache/dev-perl/File-BOM-0.160.0
index f163ba29858a..c7b6820e54de 100644
--- a/metadata/md5-cache/dev-perl/File-BOM-0.160.0
+++ b/metadata/md5-cache/dev-perl/File-BOM-0.160.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Encode-1.990.0 >=dev-perl/Readonly-0.60.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0a469bfca0fc2bb152f389ea1b47b2ac
+_md5_=095542379773b8fa80f55d54e327a1cb
diff --git a/metadata/md5-cache/dev-perl/File-BaseDir-0.30.0-r1 b/metadata/md5-cache/dev-perl/File-BaseDir-0.30.0-r1
index 6ba91b778783..6db7ae77f582 100644
--- a/metadata/md5-cache/dev-perl/File-BaseDir-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/File-BaseDir-0.30.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PARDUS/File-BaseDir-0.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1cf0aaa67831521ce22369a5018c3b87
+_md5_=844217b481bbcc35d94561ab8bf6e111
diff --git a/metadata/md5-cache/dev-perl/File-BaseDir-0.70.0 b/metadata/md5-cache/dev-perl/File-BaseDir-0.70.0
index bec2ba786835..c22df5988934 100644
--- a/metadata/md5-cache/dev-perl/File-BaseDir-0.70.0
+++ b/metadata/md5-cache/dev-perl/File-BaseDir-0.70.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec dev-perl/IPC-System-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4340e619420b494a8d849a06b16bcd70
+_md5_=2995d06613104f54f14b7b80b21bd88b
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0 b/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
index 99901ddd323c..5d12b422dda9 100644
--- a/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
+++ b/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RM/RMBARKER/File-Copy-Link-0.140.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=78cc8b05f42de143753e7fc055c3c6ff
+_md5_=e2146d2f7b623c9d44077c67984e37ca
diff --git a/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0 b/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0
index 6df9bbba7c1a..b592ca551b36 100644
--- a/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0
+++ b/metadata/md5-cache/dev-perl/File-DesktopEntry-0.220.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode >=dev-perl/File-BaseDir-0.30.0 virtual/perl-File-Path virtual/perl-File-Spec dev-perl/URI dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=567b3547d5503031d4708cb3360210b0
+_md5_=6ab16b0cd891e4803cad03090e5fffa1
diff --git a/metadata/md5-cache/dev-perl/File-DesktopEntry-0.40.0-r1 b/metadata/md5-cache/dev-perl/File-DesktopEntry-0.40.0-r1
index f757fa2e4ea7..850b3e3ca84f 100644
--- a/metadata/md5-cache/dev-perl/File-DesktopEntry-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/File-DesktopEntry-0.40.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec >=dev-perl/File-BaseDir-0.03 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PARDUS/File-DesktopEntry/File-DesktopEntry-0.04.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3b690cbfaa0279d628c656060498a5d1
+_md5_=a8d10d6e1b0113932cf9e457114e7386
diff --git a/metadata/md5-cache/dev-perl/File-Find-Rule-0.330.0-r1 b/metadata/md5-cache/dev-perl/File-Find-Rule-0.330.0-r1
index fd0bf168109b..f89b7c160c11 100644
--- a/metadata/md5-cache/dev-perl/File-Find-Rule-0.330.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Find-Rule-0.330.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec >=dev-perl/Number-Compare-0.20.0 dev-perl/Text-Glob dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.33.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ea505f79b5c82bffb734ba521e456d0
+_md5_=92956359322e59559e97214fe193bac2
diff --git a/metadata/md5-cache/dev-perl/File-Find-Rule-0.340.0 b/metadata/md5-cache/dev-perl/File-Find-Rule-0.340.0
index 9c719520952f..4b3295b08865 100644
--- a/metadata/md5-cache/dev-perl/File-Find-Rule-0.340.0
+++ b/metadata/md5-cache/dev-perl/File-Find-Rule-0.340.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-perl/Number-Compare dev-perl/Text-Glob dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.34.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c5e4b65b66eb8c33c64124798ab9f204
+_md5_=8730c627459ab6ac14339506265e0a40
diff --git a/metadata/md5-cache/dev-perl/File-Find-Rule-Perl-1.150.0 b/metadata/md5-cache/dev-perl/File-Find-Rule-Perl-1.150.0
index 04b734e3fa6f..f8359e4d6537 100644
--- a/metadata/md5-cache/dev-perl/File-Find-Rule-Perl-1.150.0
+++ b/metadata/md5-cache/dev-perl/File-Find-Rule-Perl-1.150.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm hppa ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-1.380.0 >=dev-perl/File-Find-Rule-0.200.0 >=virtual/perl-File-Spec-0.820.0 >=dev-perl/Params-Util-0.380.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/File-Find-Rule-Perl-1.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=879cdad26853ca5ce0f2dfa46beaf081
+_md5_=7462c4973354991afba9dfc418897e1a
diff --git a/metadata/md5-cache/dev-perl/File-Flock-2014.10.0 b/metadata/md5-cache/dev-perl/File-Flock-2014.10.0
index 951913ce60b5..78bc83b788bc 100644
--- a/metadata/md5-cache/dev-perl/File-Flock-2014.10.0
+++ b/metadata/md5-cache/dev-perl/File-Flock-2014.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Structure-Util >=dev-perl/IO-Event-0.812.0 dev-perl/AnyEvent dev-perl/Event virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/File-Flock-2014.01.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4bce7e8b5862e2340c40b95146f3b019
+_md5_=525826d54141b1c2cb1077932891b2cf
diff --git a/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0 b/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
index d14ea6bc96ab..101f21cb2cd1 100644
--- a/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
+++ b/metadata/md5-cache/dev-perl/File-HomeDir-1.2.0
@@ -7,7 +7,8 @@ IUSE=+xdg test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-File-Path-2.10.0 >=virtual/perl-File-Spec-3 >=virtual/perl-File-Temp-0.190.0 >=dev-perl/File-Which-0.50.0 xdg? ( x11-misc/xdg-user-dirs ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8723dafe6b4a9de94fe9e4c31a3655df
+_md5_=d73d19677a13d344ab843813936262b8
diff --git a/metadata/md5-cache/dev-perl/File-LibMagic-1.150.0 b/metadata/md5-cache/dev-perl/File-LibMagic-1.150.0
index 04b661b644bf..afad416af641 100644
--- a/metadata/md5-cache/dev-perl/File-LibMagic-1.150.0
+++ b/metadata/md5-cache/dev-perl/File-LibMagic-1.150.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ~ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-apps/file virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=581dc62f5e7fbd138d9c345771d402b8
+_md5_=18ffc9affc6e02579f04f0f879927777
diff --git a/metadata/md5-cache/dev-perl/File-Map-0.640.0 b/metadata/md5-cache/dev-perl/File-Map-0.640.0
index c50840c981d2..9869ddef9e34 100644
--- a/metadata/md5-cache/dev-perl/File-Map-0.640.0
+++ b/metadata/md5-cache/dev-perl/File-Map-0.640.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/PerlIO-Layers >=dev-perl/Sub-Exporter-Progressive-0.1.5 virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.64.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d2c5407efffda9325cfcc325feb58ca2
+_md5_=acf19d44be0b6c5383d3bb13aa34de2d
diff --git a/metadata/md5-cache/dev-perl/File-MimeInfo-0.270.0 b/metadata/md5-cache/dev-perl/File-MimeInfo-0.270.0
index 12625da8c395..915bf0c3b009 100644
--- a/metadata/md5-cache/dev-perl/File-MimeInfo-0.270.0
+++ b/metadata/md5-cache/dev-perl/File-MimeInfo-0.270.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-BaseDir-0.03 >=dev-perl/File-DesktopEntry-0.0 x11-misc/shared-mime-info dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.27.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9739e5d4969999c00283d30af83f0a73
+_md5_=f0d2210a8f72fb8708d3b46cdb2793db
diff --git a/metadata/md5-cache/dev-perl/File-MimeInfo-0.280.0 b/metadata/md5-cache/dev-perl/File-MimeInfo-0.280.0
index edb3a56723c7..88a532657534 100644
--- a/metadata/md5-cache/dev-perl/File-MimeInfo-0.280.0
+++ b/metadata/md5-cache/dev-perl/File-MimeInfo-0.280.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-BaseDir-0.30.0 >=dev-perl/File-DesktopEntry-0.40.0 x11-misc/shared-mime-info dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.28.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fb3d0625085f09b69e6a0ed12e3ef5ad
+_md5_=5e5e7cc8fdbdb3825b71b9e11201c605
diff --git a/metadata/md5-cache/dev-perl/File-Next-1.160.0 b/metadata/md5-cache/dev-perl/File-Next-1.160.0
index 4e41376d4e8e..551ffed8c56b 100644
--- a/metadata/md5-cache/dev-perl/File-Next-1.160.0
+++ b/metadata/md5-cache/dev-perl/File-Next-1.160.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/File-Next-1.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8e0a05919483fbb7b29c431d63019052
+_md5_=c6bc7f3f32f544fc8da8e5110b0f9e41
diff --git a/metadata/md5-cache/dev-perl/File-Remove-1.570.0 b/metadata/md5-cache/dev-perl/File-Remove-1.570.0
index 00d6191ab95a..2ac3bfc087e0 100644
--- a/metadata/md5-cache/dev-perl/File-Remove-1.570.0
+++ b/metadata/md5-cache/dev-perl/File-Remove-1.570.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Path >=virtual/perl-File-Spec-3.290.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.57.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e2a44d8d74dceda11a09d9884931b874
+_md5_=d212f9cb191d083b99842c8a6c94fac8
diff --git a/metadata/md5-cache/dev-perl/File-Share-0.250.0 b/metadata/md5-cache/dev-perl/File-Share-0.250.0
index 6ad1fe1e4770..37661e876356 100644
--- a/metadata/md5-cache/dev-perl/File-Share-0.250.0
+++ b/metadata/md5-cache/dev-perl/File-Share-0.250.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-ShareDir-1.30.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/File-Share-0.25.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=46c4c466885cc6ab6a46cad60315f2ab
+_md5_=2754a533a007d9fd71241306339ab6bf
diff --git a/metadata/md5-cache/dev-perl/File-ShareDir-1.104.0 b/metadata/md5-cache/dev-perl/File-ShareDir-1.104.0
index 9969e9f03a8f..2d1d32ee607b 100644
--- a/metadata/md5-cache/dev-perl/File-ShareDir-1.104.0
+++ b/metadata/md5-cache/dev-perl/File-ShareDir-1.104.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Class-Inspector-1.120.0 >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.104.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=99b6898cb79d3d29396387cb7e12d49a
+_md5_=27249a3ae10938701517f4e5d9351b67
diff --git a/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.110.0 b/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.110.0
index 771d116806d4..29a8b2ea4041 100644
--- a/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.110.0
+++ b/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=df07f59baff68f4510ab68161c32b4d2
+_md5_=1f6bf1baccf090c9616df5e470e633e2
diff --git a/metadata/md5-cache/dev-perl/File-ShareDir-ProjectDistDir-1.0.9 b/metadata/md5-cache/dev-perl/File-ShareDir-ProjectDistDir-1.0.9
index a900c9f97e81..7c1b8649431f 100644
--- a/metadata/md5-cache/dev-perl/File-ShareDir-ProjectDistDir-1.0.9
+++ b/metadata/md5-cache/dev-perl/File-ShareDir-ProjectDistDir-1.0.9
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/Path-Tiny-0.58.0 ) virtual/perl-Carp dev-perl/File-ShareDir dev-perl/Path-FindDev dev-perl/Path-IsDev dev-perl/Path-Tiny dev-perl/Sub-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/File-ShareDir-ProjectDistDir-1.000009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e6bc010824637cdc31237a1cf1db8727
+_md5_=9a2e0166e73f3462ab6922abd6cd7005
diff --git a/metadata/md5-cache/dev-perl/File-Slurp-9999.270.0 b/metadata/md5-cache/dev-perl/File-Slurp-9999.270.0
index fcfe6acf7d30..78a73be42596 100644
--- a/metadata/md5-cache/dev-perl/File-Slurp-9999.270.0
+++ b/metadata/md5-cache/dev-perl/File-Slurp-9999.270.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 >=virtual/perl-File-Spec-3.10.0 virtual/perl-File-Temp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a7e0ec6ede0325e36d17b5847315795c
+_md5_=2114b654408343b3131e3663a3b42b71
diff --git a/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0 b/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
index 4b6026b543e9..7fb38d4e1fa9 100644
--- a/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
+++ b/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Slurp-Tiny-0.004.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cbbd3db686f24cf1e5d2bd0d293cdb77
+_md5_=e8fa10f35aa7eb6698fba52354d47561
diff --git a/metadata/md5-cache/dev-perl/File-Slurper-0.10.0 b/metadata/md5-cache/dev-perl/File-Slurper-0.10.0
index 7a3521fdccac..ed900e5c9985 100644
--- a/metadata/md5-cache/dev-perl/File-Slurper-0.10.0
+++ b/metadata/md5-cache/dev-perl/File-Slurper-0.10.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/PerlIO-utf8_strict virtual/perl-Carp virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.010.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5f6ff0edc2ad57bc128518317b94bf0f
+_md5_=48109ed34622c4edd6759bf6fea5c526
diff --git a/metadata/md5-cache/dev-perl/File-Spec-Native-1.4.0 b/metadata/md5-cache/dev-perl/File-Spec-Native-1.4.0
index 2dc41962c571..ba50cfd5d5e0 100644
--- a/metadata/md5-cache/dev-perl/File-Spec-Native-1.4.0
+++ b/metadata/md5-cache/dev-perl/File-Spec-Native-1.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RW/RWSTAUNER/File-Spec-Native-1.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b829007e784be93499d87bf6ca895cc8
+_md5_=9348ea402b936246e61eba6b44b093bb
diff --git a/metadata/md5-cache/dev-perl/File-Which-1.210.0 b/metadata/md5-cache/dev-perl/File-Which-1.210.0
index 0dcf11678409..826e0df433cd 100644
--- a/metadata/md5-cache/dev-perl/File-Which-1.210.0
+++ b/metadata/md5-cache/dev-perl/File-Which-1.210.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=pwhich? ( dev-perl/App-pwhich )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a2b699b72653240ee68670fa9a5d735f
+_md5_=ac32b8af2f905aaef5b651ca40546e86
diff --git a/metadata/md5-cache/dev-perl/File-Which-1.220.0 b/metadata/md5-cache/dev-perl/File-Which-1.220.0
index f63100b7464f..bea01740af36 100644
--- a/metadata/md5-cache/dev-perl/File-Which-1.220.0
+++ b/metadata/md5-cache/dev-perl/File-Which-1.220.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=pwhich? ( dev-perl/App-pwhich )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dd31cd9fa15c837a114f446f51641d2d
+_md5_=fde7d14701309da81d7bfb0e9c008c74
diff --git a/metadata/md5-cache/dev-perl/File-Which-1.90.0-r1 b/metadata/md5-cache/dev-perl/File-Which-1.90.0-r1
index 3575630fa9ca..f26a769dd817 100644
--- a/metadata/md5-cache/dev-perl/File-Which-1.90.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Which-1.90.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/File-Which-1.09.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0895d7d4d02e69aaee98415fa7ba94d2
+_md5_=52edbd594a909d4316ae6fb96cd3b01a
diff --git a/metadata/md5-cache/dev-perl/File-chdir-0.101.100 b/metadata/md5-cache/dev-perl/File-chdir-0.101.100
index bac4b53bd5de..0fee52a2834b 100644
--- a/metadata/md5-cache/dev-perl/File-chdir-0.101.100
+++ b/metadata/md5-cache/dev-perl/File-chdir-0.101.100
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-File-Spec-3.27 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1011.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=84976ef69ee73f4efc66d3cc9350a1b7
+_md5_=bb36308f402b503d902ccc689de0a384
diff --git a/metadata/md5-cache/dev-perl/File-chmod-0.420.0 b/metadata/md5-cache/dev-perl/File-chmod-0.420.0
index a06defd11c9b..5b3e728975fb 100644
--- a/metadata/md5-cache/dev-perl/File-chmod-0.420.0
+++ b/metadata/md5-cache/dev-perl/File-chmod-0.420.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XE/XENO/File-chmod-0.42.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9f43be4b0fb6a9ebdf67693212d9c02a
+_md5_=1aa255df0209e9b7a2afce95c0a36d85
diff --git a/metadata/md5-cache/dev-perl/File-pushd-1.14.0 b/metadata/md5-cache/dev-perl/File-pushd-1.14.0
index 819c978f3beb..98f09215bab4 100644
--- a/metadata/md5-cache/dev-perl/File-pushd-1.14.0
+++ b/metadata/md5-cache/dev-perl/File-pushd-1.14.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.014.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b840da9e9904e8955996da5f30ad0177
+_md5_=3d0254eabac248298d1c150b43aa0b2e
diff --git a/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800 b/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
index c4ca4750269b..59a0b7ebc608 100644
--- a/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
+++ b/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.140.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/FileHandle-Unget-0.1628.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a43c11430213e46013a475241a909ed4
+_md5_=b81f11e48506246c733cd57956bc9f32
diff --git a/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0 b/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
index b9ce5dd8711f..426c71b263f7 100644
--- a/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
+++ b/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Filter dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d728fdc852b97d13b082a2c2e53e8a69
+_md5_=cab745e587806f5f14efd0d796fce668
diff --git a/metadata/md5-cache/dev-perl/Finance-Quote-1.470.0 b/metadata/md5-cache/dev-perl/Finance-Quote-1.470.0
index 912efcce0fa4..881c599362ed 100644
--- a/metadata/md5-cache/dev-perl/Finance-Quote-1.470.0
+++ b/metadata/md5-cache/dev-perl/Finance-Quote-1.470.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/CGI virtual/perl-Carp dev-perl/DateTime virtual/perl-Encode virtual/perl-Exporter dev-perl/HTML-Parser dev-perl/HTML-TableExtract dev-perl/HTML-Tree dev-perl/HTTP-Cookies dev-perl/HTTP-Message dev-perl/JSON dev-perl/LWP-Protocol-https dev-perl/libwww-perl dev-perl/Mozilla-CA virtual/perl-Time-Piece dev-perl/URI dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.47.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=aab07470ba9270c1d3d67628351ddb00
+_md5_=c782fb83c774c17bd3122e762f4c082e
diff --git a/metadata/md5-cache/dev-perl/Fuse-0.16.1-r1 b/metadata/md5-cache/dev-perl/Fuse-0.16.1-r1
index 6c145a97c6ca..d636e23cf0c1 100644
--- a/metadata/md5-cache/dev-perl/Fuse-0.16.1-r1
+++ b/metadata/md5-cache/dev-perl/Fuse-0.16.1-r1
@@ -8,7 +8,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/fuse:= dev-perl/Filesys-Statvfs dev-perl/Lchown dev-perl/Unix-Mknod dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPATES/Fuse-0.16.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c76065a4dc2bda88e2d12f30190c6cff
+_md5_=e0407454a54f1d48d7bf0327ae41ccbd
diff --git a/metadata/md5-cache/dev-perl/GDGraph-1.510.0 b/metadata/md5-cache/dev-perl/GDGraph-1.510.0
index 6d0b1bdbb1be..461558db0f5c 100644
--- a/metadata/md5-cache/dev-perl/GDGraph-1.510.0
+++ b/metadata/md5-cache/dev-perl/GDGraph-1.510.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/GD-1.180.0 >=dev-perl/GDTextUtil-0.800.0 media-libs/gd dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.51.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=413de6b10dcff53a3a610a708c939e7d
+_md5_=1831052e1fe6ccce211a1f0b6099c67b
diff --git a/metadata/md5-cache/dev-perl/GDGraph-1.520.0 b/metadata/md5-cache/dev-perl/GDGraph-1.520.0
index 4e1d2612de82..6b08937e499f 100644
--- a/metadata/md5-cache/dev-perl/GDGraph-1.520.0
+++ b/metadata/md5-cache/dev-perl/GDGraph-1.520.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/GD-1.180.0 >=dev-perl/GDTextUtil-0.800.0 media-libs/gd dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.52.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f08905fb949bd67a3cea5ad970ef72b8
+_md5_=2c5ca78a9c0f2f990a1dd423d05b50a1
diff --git a/metadata/md5-cache/dev-perl/GDGraph-1.540.0 b/metadata/md5-cache/dev-perl/GDGraph-1.540.0
index 4d7153621bb4..f89d41f07269 100644
--- a/metadata/md5-cache/dev-perl/GDGraph-1.540.0
+++ b/metadata/md5-cache/dev-perl/GDGraph-1.540.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/GD-1.180.0 >=dev-perl/GDTextUtil-0.800.0 media-libs/gd dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6f82e527eead5a3cbeba3c0686300426
+_md5_=765beadbde76f5def8e417145815b9d1
diff --git a/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1 b/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
index 556548042b10..29194af6a5ed 100644
--- a/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/krb5 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e4a52975ae46cb528bab2b6d2d460fd1
+_md5_=25824a4a9a0fcc9e59dde93e0bf68106
diff --git a/metadata/md5-cache/dev-perl/Gearman-2.4.9 b/metadata/md5-cache/dev-perl/Gearman-2.4.9
index 3d7e76095bf4..2292eb1457c2 100644
--- a/metadata/md5-cache/dev-perl/Gearman-2.4.9
+++ b/metadata/md5-cache/dev-perl/Gearman-2.4.9
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PALIK/Gearman-2.004.009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=525f4105d25a3ac88a8492d9f7385684
+_md5_=345765a23f8b2ed44509e7f33f8b502e
diff --git a/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.940.0-r2 b/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.940.0-r2
index dd367b49a202..a09d11f90819 100644
--- a/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.940.0-r2
+++ b/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.940.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Gearman-1.07 >=dev-perl/Danga-Socket-1.57 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRADFITZ/Gearman-Client-Async-0.94.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0d7d6d0d51bb67bd610d46498efd0d0e
+_md5_=5d5f3f346bfae1b9ad4afc141f01f7be
diff --git a/metadata/md5-cache/dev-perl/Gearman-Server-1.130.1-r1 b/metadata/md5-cache/dev-perl/Gearman-Server-1.130.1-r1
index d84528de2984..2fdbf3667da2 100644
--- a/metadata/md5-cache/dev-perl/Gearman-Server-1.130.1-r1
+++ b/metadata/md5-cache/dev-perl/Gearman-Server-1.130.1-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Danga-Socket-1.520.0 >=dev-perl/Gearman-1.07 !!sys-cluster/gearmand dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PALIK/Gearman-Server-v1.130.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=16a9186c9baf2910770f62124218c1a4
+_md5_=d6036fe0907d97d76c25a9659f5e2d28
diff --git a/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.200.0 b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.200.0
index 684e8f352ed5..2fd11b8340da 100644
--- a/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.200.0
+++ b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.200.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-vcs/git virtual/perl-Encode dev-perl/File-Which dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/perl-File-Temp virtual/perl-HTTP-Tiny virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor !app-portage/pram dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MO/MONSIEURP/Gentoo-App-Pram-0.200000.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d604768955b4fe86bf327af6d7143674
+_md5_=f26a207245d666e1d19e5eae09f56d81
diff --git a/metadata/md5-cache/dev-perl/Gentoo-PerlMod-Version-0.8.1 b/metadata/md5-cache/dev-perl/Gentoo-PerlMod-Version-0.8.1
index ae0f62358946..5396b9f10e7e 100644
--- a/metadata/md5-cache/dev-perl/Gentoo-PerlMod-Version-0.8.1
+++ b/metadata/md5-cache/dev-perl/Gentoo-PerlMod-Version-0.8.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Sub-Exporter-Progressive >=virtual/perl-version-0.770.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/Gentoo-PerlMod-Version-v0.8.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2f1df840d0a8029441191cd86862f7e5
+_md5_=c79ee0e4439111cc44a4be56efcd71e2
diff --git a/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.103.0 b/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.103.0
index 62b324e3ae70..996c2aa5af56 100644
--- a/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.103.0
+++ b/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.103.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 arm ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/MooseX-Getopt-0.660.0 virtual/perl-Carp >=virtual/perl-Getopt-Long-2.330.0 >=dev-perl/Params-Validate-0.970.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-0.972.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.103.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c548b6214af0e69a01ab85c4b6c9f304
+_md5_=c94a33b2b8b7c8134d5c8082d9e13f6e
diff --git a/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0 b/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
index 21d8e90a80e3..d8f71d317606 100644
--- a/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
+++ b/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Getopt-Mixed-1.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bc02a1f876157e6e76b669947101e8e5
+_md5_=5245bb3ec7d977a6e15a5cfab4286b74
diff --git a/metadata/md5-cache/dev-perl/Git-Wrapper-0.47.0-r1 b/metadata/md5-cache/dev-perl/Git-Wrapper-0.47.0-r1
index 3f26124883e2..53ce96af681a 100644
--- a/metadata/md5-cache/dev-perl/Git-Wrapper-0.47.0-r1
+++ b/metadata/md5-cache/dev-perl/Git-Wrapper-0.47.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-vcs/git virtual/perl-File-Temp dev-perl/File-chdir virtual/perl-IPC-Cmd virtual/perl-Scalar-List-Utils dev-perl/Sort-Versions dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GE/GENEHACK/Git-Wrapper-0.047.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fb75f32d480a34cc9ee78f57a144555d
+_md5_=a3df27557a2728cdaa1138ca7e7d076d
diff --git a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r2 b/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r2
index 67295fa9d362..6cdde6514e0e 100644
--- a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r2
+++ b/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-crypt/gnupg-1.2.1-r1 virtual/perl-autodie >=virtual/perl-Math-BigInt-1.780.0 >=dev-perl/Moo-0.91.11 >=dev-perl/MooX-HandlesVia-0.1.4 >=dev-perl/MooX-late-0.14.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b04715085293a94d5a70990ee338fedf
+_md5_=858e71e296d9dfa9d138f121798ec220
diff --git a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r3 b/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r3
index 1dad2d5c6dd4..b79072968a13 100644
--- a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r3
+++ b/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-crypt/gnupg-1.2.1-r1 virtual/perl-autodie >=virtual/perl-Math-BigInt-1.780.0 >=dev-perl/Moo-0.91.11 >=dev-perl/MooX-HandlesVia-0.1.4 >=dev-perl/MooX-late-0.14.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=128586701ef4b9b0ed00558bf92208a4
+_md5_=c35e0da27f35b813abbdaff8f572ca60
diff --git a/metadata/md5-cache/dev-perl/GooCanvas2-0.60.0 b/metadata/md5-cache/dev-perl/GooCanvas2-0.60.0
index d6930520cbe4..f2763e43af31 100644
--- a/metadata/md5-cache/dev-perl/GooCanvas2-0.60.0
+++ b/metadata/md5-cache/dev-perl/GooCanvas2-0.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=x11-libs/goocanvas:2.0 dev-perl/Gtk3 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERLMAX/GooCanvas2-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=19822aaae6999932fad9f8fb5a71485e
+_md5_=0f4856cc04df2f4a8fd3856b8e08a00f
diff --git a/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-4.18.0 b/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-4.18.0
index e240d1effc4c..a20b7d8721f3 100644
--- a/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-4.18.0
+++ b/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-4.18.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-perl/Class-Load >=dev-perl/Class-Std-Fast-0.0.5 dev-perl/Crypt-OpenSSL-RSA dev-perl/File-HomeDir virtual/perl-File-Spec dev-perl/IO-Socket-SSL dev-perl/JSON-Parse dev-perl/LWP-Protocol-https dev-perl/libwww-perl dev-perl/Log-Log4perl >=dev-perl/SOAP-WSDL-2.00.10 virtual/perl-Scalar-List-Utils dev-perl/Template-Toolkit dev-perl/URI dev-perl/XML-Simple dev-perl/XML-XPath examples? ( virtual/perl-Digest-SHA virtual/perl-File-Temp dev-perl/HTTP-Server-Simple ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SU/SUNDQUIST/Google-Ads-AdWords-Client-4.18.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3d5f057fc64e2c5835cde5e750fd4b64
+_md5_=800bbded71e7242ef5db0a9e9f68fd77
diff --git a/metadata/md5-cache/dev-perl/GraphViz-2.240.0 b/metadata/md5-cache/dev-perl/GraphViz-2.240.0
index 92a1e1683854..76fae46835ca 100644
--- a/metadata/md5-cache/dev-perl/GraphViz-2.240.0
+++ b/metadata/md5-cache/dev-perl/GraphViz-2.240.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=media-gfx/graphviz >=virtual/perl-Carp-1.10.0 >=virtual/perl-Getopt-Long-2.340.0 virtual/perl-IO >=dev-perl/IPC-Run-0.600.0 >=dev-perl/libwww-perl-6 >=dev-perl/Parse-RecDescent-1.965.1 >=virtual/perl-Time-HiRes-1.510.0 >=dev-perl/XML-Twig-3.520.0 >=dev-perl/XML-XPath-1.130.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/GraphViz-2.24.tgz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=26df5eb7d5902820eeba6f5d89a7b293
+_md5_=e7dae6b9d06730777d23b84db63ae9e7
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0 b/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
index a18def0b3f20..3c9242b30331 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Graphics-ColorNames-0.320.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Graphics-ColorNames-WWW-1.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ed0c844567f4f75aed6a0ceb45195b86
+_md5_=7f17fdeac88558d6153c6258a6a1d07b
diff --git a/metadata/md5-cache/dev-perl/Gtk2-1.249.920 b/metadata/md5-cache/dev-perl/Gtk2-1.249.920
index 11b1ec404016..979e7327b0a9 100644
--- a/metadata/md5-cache/dev-perl/Gtk2-1.249.920
+++ b/metadata/md5-cache/dev-perl/Gtk2-1.249.920
@@ -7,7 +7,8 @@ IUSE=test test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/gtk+:2 >=dev-perl/Cairo-1 >=dev-perl/glib-perl-1.280.0 >=dev-perl/Pango-1.220.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24992.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=d328fb73bd320ff0b072974cdba643cf
+_md5_=16150d0e43a9f6fa66928865188b0c1e
diff --git a/metadata/md5-cache/dev-perl/Gtk2-Notify-0.50.0 b/metadata/md5-cache/dev-perl/Gtk2-Notify-0.50.0
index dc362042b69c..6a66ce7efc58 100644
--- a/metadata/md5-cache/dev-perl/Gtk2-Notify-0.50.0
+++ b/metadata/md5-cache/dev-perl/Gtk2-Notify-0.50.0
@@ -7,7 +7,8 @@ IUSE=test test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=dev-perl/glib-perl dev-perl/Gtk2 >=x11-libs/libnotify-0.7 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/Gtk2-Notify-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=d8f745776b67b844f2bb5ae3cb3fb17a
+_md5_=32f43faf0af6454c21e436298c747b1a
diff --git a/metadata/md5-cache/dev-perl/Gtk3-0.34.0 b/metadata/md5-cache/dev-perl/Gtk3-0.34.0
index 4ebd11e01c05..f47baca46772 100644
--- a/metadata/md5-cache/dev-perl/Gtk3-0.34.0
+++ b/metadata/md5-cache/dev-perl/Gtk3-0.34.0
@@ -7,7 +7,8 @@ IUSE=test test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/gtk+:3[introspection] >=dev-perl/Cairo-GObject-1.0.0 virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Glib-Object-Introspection-0.43.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.034.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=e03bebb3aac7394185ce64e6822643a4
+_md5_=846cf7ad7e6384371398f45c1749c385
diff --git a/metadata/md5-cache/dev-perl/Gtk3-SimpleList-0.170.0 b/metadata/md5-cache/dev-perl/Gtk3-SimpleList-0.170.0
index 45f779f66722..fda84a66ab6f 100644
--- a/metadata/md5-cache/dev-perl/Gtk3-SimpleList-0.170.0
+++ b/metadata/md5-cache/dev-perl/Gtk3-SimpleList-0.170.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-perl/Gtk3 virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c1d1f4bcf110c979f1021cbb4590e662
+_md5_=1aed241d059dbd818ad31e01b53f0a7d
diff --git a/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0 b/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
index 871b87027bb7..112354ffbe9d 100644
--- a/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
+++ b/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser virtual/perl-Carp dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/HTML-FillInForm-2.21.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a5a8e605e679ab4156a063d15e371e24
+_md5_=4883d35d11441d5d5b6dc61d0f96a48f
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
index d31554a4f67f..9616473dd703 100644
--- a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Formatter-2 dev-perl/HTML-Tree dev-perl/URI dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8bdc4187bc8f075e16a65de8080f9916
+_md5_=36fa03a3d49746ccd7c97117c1358de7
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.70.0-r1 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.70.0-r1
index 6a40c45fc834..fdb2c5ddf527 100644
--- a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.70.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.70.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=150cd9e738acc6b6be210983884f4320
+_md5_=b5eaa5f4af3329cb66770a0b39ca40e5
diff --git a/metadata/md5-cache/dev-perl/HTML-Formatter-2.160.0 b/metadata/md5-cache/dev-perl/HTML-Formatter-2.160.0
index 9a8996bf4479..e273ef8d09ea 100644
--- a/metadata/md5-cache/dev-perl/HTML-Formatter-2.160.0
+++ b/metadata/md5-cache/dev-perl/HTML-Formatter-2.160.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode dev-perl/Font-AFM dev-perl/HTML-Tree virtual/perl-IO virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5960010670db5364c5b4ee7fe5b30b17
+_md5_=64167fd5fdfc96e9fb572ebb28a7ab2f
diff --git a/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0 b/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
index a750f53f919b..f1e6b0ed1a30 100644
--- a/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
+++ b/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm hppa ~mips ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Find-0.90.0 >=virtual/perl-Exporter-5.58 >=dev-perl/HTML-Parser-1.260.0 >=virtual/perl-Scalar-List-Utils-1.120.0 >=virtual/perl-Text-Tabs+Wrap-98.112.800 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/HTML-FromText-2.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5707ad61531a550a423b310d2684dd6c
+_md5_=73238938c213eae821104c0252bfa005
diff --git a/metadata/md5-cache/dev-perl/HTML-Gumbo-0.180.0 b/metadata/md5-cache/dev-perl/HTML-Gumbo-0.180.0
index c5f148b2151e..7407c771d77c 100644
--- a/metadata/md5-cache/dev-perl/HTML-Gumbo-0.180.0
+++ b/metadata/md5-cache/dev-perl/HTML-Gumbo-0.180.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-LibGumbo-0.30.0 virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/HTML-Gumbo-0.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2217e6fb5ea6401fab62e4fb908a9b07
+_md5_=27f809a9ec8249ded92fd33160d4cff1
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0 b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
index b6019f8be1bc..740ed37ad664 100644
--- a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
@@ -7,7 +7,8 @@ IUSE=modperl test modperl
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!modperl? ( >=dev-perl/CGI-2.460.0 ) modperl? ( www-apache/libapreq2 >=www-apache/mod_perl-2 ) >=dev-perl/Cache-Cache-1 >=dev-perl/Class-Container-0.70.0 >=dev-perl/Exception-Class-1.150.0 virtual/perl-File-Spec dev-perl/HTML-Parser >=dev-perl/Log-Any-0.80.0 >=dev-perl/Params-Validate-0.70.0 virtual/perl-Scalar-List-Utils modperl? ( =www-servers/apache-2* ) dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.56.tar.gz
 _eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b4606f6895ef84c6de452b603dc91633
+_md5_=d67909714ff170e3773f6b5e45cd1ffe
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0 b/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
index edd47119c2c3..664fc989a421 100644
--- a/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/CGI-PSGI dev-perl/HTML-Mason dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/HTML-Mason-PSGIHandler-0.53.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7408c0d624058b0657bca82d50958a0c
+_md5_=48d2cc6d181fe55b8e2d1fe678446620
diff --git a/metadata/md5-cache/dev-perl/HTML-Packer-2.60.0 b/metadata/md5-cache/dev-perl/HTML-Packer-2.60.0
index 08549b86e8bc..571e9f161f5b 100644
--- a/metadata/md5-cache/dev-perl/HTML-Packer-2.60.0
+++ b/metadata/md5-cache/dev-perl/HTML-Packer-2.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CSS-Packer-2.10.0 >=dev-perl/JavaScript-Packer-2.10.0 >=dev-perl/Regexp-RegGrp-1.1.1_rc dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/HTML-Packer-2.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c5a2505e6c84a13da0b79ee74a71e967
+_md5_=df440d57be94fac40d4be533234a9752
diff --git a/metadata/md5-cache/dev-perl/HTML-Parser-3.710.0-r1 b/metadata/md5-cache/dev-perl/HTML-Parser-3.710.0-r1
index 8cebc304ebee..461018a0a2a0 100644
--- a/metadata/md5-cache/dev-perl/HTML-Parser-3.710.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Parser-3.710.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Tagset-3.03 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.71.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6df73f9ae03af862fdcd953cc0efa47
+_md5_=c9ac6fbbef0935bbd252d8894576e40c
diff --git a/metadata/md5-cache/dev-perl/HTML-Parser-3.720.0 b/metadata/md5-cache/dev-perl/HTML-Parser-3.720.0
index 82c4a7014406..2862c31dfd7f 100644
--- a/metadata/md5-cache/dev-perl/HTML-Parser-3.720.0
+++ b/metadata/md5-cache/dev-perl/HTML-Parser-3.720.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Tagset-3.03 virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.72.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d836ac74234700b93955bd622f3d70e4
+_md5_=a7b86a5447c2654969a6f9650fab0d35
diff --git a/metadata/md5-cache/dev-perl/HTML-Scrubber-0.170.0 b/metadata/md5-cache/dev-perl/HTML-Scrubber-0.170.0
index c2bf2aecb5c3..133925d09e0a 100644
--- a/metadata/md5-cache/dev-perl/HTML-Scrubber-0.170.0
+++ b/metadata/md5-cache/dev-perl/HTML-Scrubber-0.170.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e344999636687cdaf9371304a81a8e59
+_md5_=9c256a35d8e589a46ae0ef6bbcbef502
diff --git a/metadata/md5-cache/dev-perl/HTML-Strip-2.100.0 b/metadata/md5-cache/dev-perl/HTML-Strip-2.100.0
index 7205db886f4b..681bd2e33657 100644
--- a/metadata/md5-cache/dev-perl/HTML-Strip-2.100.0
+++ b/metadata/md5-cache/dev-perl/HTML-Strip-2.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ~ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KI/KILINRAX/HTML-Strip-2.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=41956537a415250c3ff8bc81802454fa
+_md5_=984080303025cbb8627371d969c12476
diff --git a/metadata/md5-cache/dev-perl/HTML-StripScripts-1.60.0 b/metadata/md5-cache/dev-perl/HTML-StripScripts-1.60.0
index c55f8b3736e4..c327129772b2 100644
--- a/metadata/md5-cache/dev-perl/HTML-StripScripts-1.60.0
+++ b/metadata/md5-cache/dev-perl/HTML-StripScripts-1.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-1.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7501d75f1c2077609924803eca683c96
+_md5_=f84ebdccccbdc639f8319e5deb938610
diff --git a/metadata/md5-cache/dev-perl/HTML-StripScripts-Parser-1.30.0 b/metadata/md5-cache/dev-perl/HTML-StripScripts-Parser-1.30.0
index 96cc6950fd6d..d6ae42d0b984 100644
--- a/metadata/md5-cache/dev-perl/HTML-StripScripts-Parser-1.30.0
+++ b/metadata/md5-cache/dev-perl/HTML-StripScripts-Parser-1.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Parser-3.560.0 >=dev-perl/HTML-StripScripts-1.50.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-Parser-1.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=abe6b3763164809eeb664c0225d4a585
+_md5_=7702ef1f686427d39e9a681d7dd37c57
diff --git a/metadata/md5-cache/dev-perl/HTML-TableParser-0.420.0 b/metadata/md5-cache/dev-perl/HTML-TableParser-0.420.0
index 99936bd11a89..761a8125e393 100644
--- a/metadata/md5-cache/dev-perl/HTML-TableParser-0.420.0
+++ b/metadata/md5-cache/dev-perl/HTML-TableParser-0.420.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-perl/HTML-Parser-3.260.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DJ/DJERIUS/HTML-TableParser-0.42.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=83745b2e393b25eb5b5f4a6ef5938ee5
+_md5_=d017e5c1b069dc05e62bab22d9ca0ca8
diff --git a/metadata/md5-cache/dev-perl/HTML-Template-2.970.0 b/metadata/md5-cache/dev-perl/HTML-Template-2.970.0
index db6ebf9b19e3..c5e541e59881 100644
--- a/metadata/md5-cache/dev-perl/HTML-Template-2.970.0
+++ b/metadata/md5-cache/dev-perl/HTML-Template-2.970.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ~arm ~mips ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 >=virtual/perl-File-Spec-0.820.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-2.97.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d6bd380a134650eb4d5f522bec5795a9
+_md5_=a79f60dba23f39b53fd5147b0e8d8752
diff --git a/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0 b/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
index d95bfb366364..88f4f45be60e 100644
--- a/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
+++ b/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Path-2.0.0 virtual/perl-File-Spec >=dev-perl/JSON-2.0.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIY/HTML-Template-Pro-0.9510.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e6b4de1a755cb70fdb26fb1c7c29840
+_md5_=2248bce1dc6f09a1abb23fe12b6247fd
diff --git a/metadata/md5-cache/dev-perl/HTML-Tree-5.60.0 b/metadata/md5-cache/dev-perl/HTML-Tree-5.60.0
index 2cf4ed1841f3..858ea4a1dac5 100644
--- a/metadata/md5-cache/dev-perl/HTML-Tree-5.60.0
+++ b/metadata/md5-cache/dev-perl/HTML-Tree-5.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/HTML-Tagset-3.20.0 >=dev-perl/HTML-Parser-3.460.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/HTML-Tree-5.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=12923ffb29d6067393f9fbf4040392ff
+_md5_=e60c050fc6e83658c81421ab8c2981ca
diff --git a/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0 b/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0
index 016a59de6199..067fe3de39f6 100644
--- a/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0
+++ b/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/HTML-Tagset-3.20.0 >=dev-perl/HTML-Parser-3.460.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/HTML-Tree-5.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1dc95809f2f018b75173fe66302135a0
+_md5_=c9cb877845fc63cc3256c52cbc97ce22
diff --git a/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0 b/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
index 738a4add0e8b..43f232cf776f 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 >=virtual/perl-File-Temp-0.140.0 dev-perl/HTTP-Message >=virtual/perl-IO-1.140.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.22.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e596d225a56c6035179f09b25a3a52ca
+_md5_=3a80743309f8e87b4decba2f80cb7eae
diff --git a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.140.0 b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.140.0
index 5afb60ce949e..20fc9e58e84c 100644
--- a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.140.0
+++ b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ~mips ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-BrowserDetect-3.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=910e3418db4502f11b2743a2f71aceac
+_md5_=a0aa5e7b8cfdc8cee683d6051c09bed5
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0 b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
index 6700f49a7626..33b95c32bd60 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ~arm ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTIASH/HTTP-Cache-Transparent-1.4.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d52d386e5036df01ba4e51f8416c65b0
+_md5_=4c7b53a90412714e0c21f98ddc6abfee
diff --git a/metadata/md5-cache/dev-perl/HTTP-CookieJar-0.8.0 b/metadata/md5-cache/dev-perl/HTTP-CookieJar-0.8.0
index cb1f5ab487c6..5106bc7393bc 100644
--- a/metadata/md5-cache/dev-perl/HTTP-CookieJar-0.8.0
+++ b/metadata/md5-cache/dev-perl/HTTP-CookieJar-0.8.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Mozilla-PublicSuffix ) virtual/perl-Carp dev-perl/HTTP-Date >=virtual/perl-Time-Local-1.190.100 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=628334493ce2c4a5a0ab61cac70ee108
+_md5_=37466327fe27a14d4ea0c2d1305870e1
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cookies-6.40.0 b/metadata/md5-cache/dev-perl/HTTP-Cookies-6.40.0
index 53ad6d37ba12..8e8d90ebbe54 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Cookies-6.40.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Cookies-6.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp >=dev-perl/HTTP-Date-6.0.0 virtual/perl-Time-Local >=dev-perl/HTTP-Message-6.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=12ccb41dc7d963599a3fbe96d4633fc7
+_md5_=6349f138aa75c0532ce483547c8f5303
diff --git a/metadata/md5-cache/dev-perl/HTTP-Daemon-6.60.0 b/metadata/md5-cache/dev-perl/HTTP-Daemon-6.60.0
index 2da8549f8e70..c7857c4d7eea 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Daemon-6.60.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Daemon-6.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Message-6.0.0 virtual/perl-IO-Socket-IP >=dev-perl/LWP-MediaTypes-6.0.0 virtual/perl-Socket dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-6.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c7ffd72fc09b4292c573d31df02e378a
+_md5_=c0b19bdb70f7fd08b9edd86474aebffc
diff --git a/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.200.0 b/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.200.0
index c0f4af0dd848..05f46de90a7e 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.200.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.200.0
@@ -7,7 +7,8 @@ IUSE=test +xs examples
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode virtual/perl-File-Temp dev-perl/HTTP-MultiPartParser dev-perl/Hash-MultiValue >=dev-perl/JSON-MaybeXS-1.3.7 virtual/perl-Module-Load dev-perl/Stream-Buffered >=dev-perl/WWW-Form-UrlEncoded-0.230.0 xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.20.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d0749fb1e56a507151a752f75f973a2e
+_md5_=b30c0962895d4d613b355113f84d7c71
diff --git a/metadata/md5-cache/dev-perl/HTTP-Headers-Fast-0.210.0 b/metadata/md5-cache/dev-perl/HTTP-Headers-Fast-0.210.0
index f914ee030c2c..f088d07ac3a3 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Headers-Fast-0.210.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Headers-Fast-0.210.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTTP-Date dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/HTTP-Headers-Fast-0.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dfe1b2c8bd2cb52a563237fa32ff4f08
+_md5_=2ba4af1333a1d0d7399130191a6936ba
diff --git a/metadata/md5-cache/dev-perl/HTTP-Headers-Fast-0.220.0 b/metadata/md5-cache/dev-perl/HTTP-Headers-Fast-0.220.0
index d6f9e95d8e93..c2e49830bbb9 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Headers-Fast-0.220.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Headers-Fast-0.220.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTTP-Date dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/HTTP-Headers-Fast-0.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1c2156da10f2e24adbe2b7b29e368747
+_md5_=9a9f51488e007db32043e527b65f81a0
diff --git a/metadata/md5-cache/dev-perl/HTTP-Message-6.110.0 b/metadata/md5-cache/dev-perl/HTTP-Message-6.110.0
index 80f645f0402a..750176abb833 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Message-6.110.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Message-6.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Compress-Raw-Zlib >=dev-perl/URI-1.100.0 >=virtual/perl-Encode-2.210.0 >=dev-perl/HTTP-Date-6.0.0 dev-perl/IO-HTML >=dev-perl/Encode-Locale-1.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-IO-Compress-2.021 >=virtual/perl-MIME-Base64-2.100.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/HTTP-Message-6.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=41d5048b3a74df7728677ea423d059ff
+_md5_=d286617562b8f14754be4411c97bdb5d
diff --git a/metadata/md5-cache/dev-perl/HTTP-Message-6.130.0 b/metadata/md5-cache/dev-perl/HTTP-Message-6.130.0
index dd0edc6cd235..29c397cf9bb8 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Message-6.130.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Message-6.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Compress-Raw-Zlib >=dev-perl/URI-1.100.0 >=virtual/perl-Encode-2.210.0 >=dev-perl/HTTP-Date-6.0.0 dev-perl/IO-HTML >=dev-perl/Encode-Locale-1.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-IO-Compress-2.021 >=virtual/perl-MIME-Base64-2.100.0 >=virtual/perl-Exporter-5.570.0 virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=01c8ef7f44a3ea738e0a088110122990
+_md5_=7ef37906c3d9c26574c34e78139acd84
diff --git a/metadata/md5-cache/dev-perl/HTTP-MultiPartParser-0.20.0 b/metadata/md5-cache/dev-perl/HTTP-MultiPartParser-0.20.0
index aeaebe1cad2f..5aee0a94616b 100644
--- a/metadata/md5-cache/dev-perl/HTTP-MultiPartParser-0.20.0
+++ b/metadata/md5-cache/dev-perl/HTTP-MultiPartParser-0.20.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-MultiPartParser-0.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a681454d034e91c4387a25022fe87d54
+_md5_=5e5275ae190ebaae038eefbaadfd890e
diff --git a/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
index ef0073918580..59ded8e44f40 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.06.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=81ce41e2d08678db33ffc22e644ce988
+_md5_=275aad9ec6364f1559e76597329c874b
diff --git a/metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0 b/metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0
index ca2611876e68..32bd8a323779 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Server-Simple-0.520.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/CGI >=virtual/perl-Socket-1.940.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPS/HTTP-Server-Simple-0.52.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bbc389ba280f2db4763c897cb4abb410
+_md5_=610fe4b3c0d7afb7de49dc573ca5a2ae
diff --git a/metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0 b/metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0
index dfb3b156d938..c7661c333e04 100644
--- a/metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0
+++ b/metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-XSLoader-0.20.0 >=virtual/perl-parent-0.221.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Hash-FieldHash-0.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=23ac0313833e8184f9a62d79e744ea79
+_md5_=91d627b1bab101efaf457397f10397da
diff --git a/metadata/md5-cache/dev-perl/Hash-Merge-Simple-0.51.0 b/metadata/md5-cache/dev-perl/Hash-Merge-Simple-0.51.0
index 5cc9ea07d5e9..c3cdb02743d3 100644
--- a/metadata/md5-cache/dev-perl/Hash-Merge-Simple-0.51.0
+++ b/metadata/md5-cache/dev-perl/Hash-Merge-Simple-0.51.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Clone virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROKR/Hash-Merge-Simple-0.051.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=eef90861740f78ecaa2c0b73e9f2f7bf
+_md5_=d8662184038d57e1c880ac73f44b4721
diff --git a/metadata/md5-cache/dev-perl/Hash-MoreUtils-0.50.0 b/metadata/md5-cache/dev-perl/Hash-MoreUtils-0.50.0
index 701e5bfb2b61..3930db641274 100644
--- a/metadata/md5-cache/dev-perl/Hash-MoreUtils-0.50.0
+++ b/metadata/md5-cache/dev-perl/Hash-MoreUtils-0.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Hash-MoreUtils-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=227a90e18369d17d0599ce31a7a5b95c
+_md5_=3b8e16631786d2810f08ecb83fb5877a
diff --git a/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0 b/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
index 410d1bb88fdc..b0fed77cdb15 100644
--- a/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
+++ b/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-0.16.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=946e73bef8f87f32f755d32e18329fbc
+_md5_=935c72171f0d096e2ae79d25b6cd3089
diff --git a/metadata/md5-cache/dev-perl/Hook-LexWrap-0.250.0 b/metadata/md5-cache/dev-perl/Hook-LexWrap-0.250.0
index cdc6c1679593..b2301931e217 100644
--- a/metadata/md5-cache/dev-perl/Hook-LexWrap-0.250.0
+++ b/metadata/md5-cache/dev-perl/Hook-LexWrap-0.250.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Hook-LexWrap-0.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=77d6c0e41dc1ba44ccd7f0fc9418bcde
+_md5_=4c594f5786a2700b22711cd68ae5577e
diff --git a/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0 b/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
index a654b8e774b0..286b8769b131 100644
--- a/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
+++ b/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Hook-LexWrap-0.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6b96ea6005e00cabdfeeae3ab8c9206f
+_md5_=b9f62f7f32517da60a4b86e2a65fb965
diff --git a/metadata/md5-cache/dev-perl/IMAP-BodyStructure-1.30.0 b/metadata/md5-cache/dev-perl/IMAP-BodyStructure-1.30.0
index 15e562087313..724794fe6375 100644
--- a/metadata/md5-cache/dev-perl/IMAP-BodyStructure-1.30.0
+++ b/metadata/md5-cache/dev-perl/IMAP-BodyStructure-1.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAPPA/IMAP-BodyStructure-1.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cb4976abb9f8ef168bed3bb2dc06afe9
+_md5_=0a70946819b2d97cc3a1d763378768af
diff --git a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400 b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400
index db346c037516..6e2e81595e27 100644
--- a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400
+++ b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-File-Temp-0.160.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/IO-CaptureOutput-1.1104.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=660ed5d5dbd97cef91e4c305616189d5
+_md5_=f6a53bf2ae5ee541478011fa838a823d
diff --git a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400-r1 b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400-r1
index 8751d640483e..008edde6f2c0 100644
--- a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400-r1
+++ b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-File-Temp-0.160.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/IO-CaptureOutput-1.1104.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4ce934967a387d0a8368a0b17fc3f28d
+_md5_=480868c9597aed990915eafa3a43139f
diff --git a/metadata/md5-cache/dev-perl/IO-HTML-1.1.0 b/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
index 1287b411be04..da3a1d1b788c 100644
--- a/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
+++ b/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.100.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=995e4c4c4d0c987c15e90dc26331cd55
+_md5_=2c18b9ef5d0c0ac0143162acf2835c7e
diff --git a/metadata/md5-cache/dev-perl/IO-Handle-Util-0.10.0 b/metadata/md5-cache/dev-perl/IO-Handle-Util-0.10.0
index e0128acd90a7..b7445261f629 100644
--- a/metadata/md5-cache/dev-perl/IO-Handle-Util-0.10.0
+++ b/metadata/md5-cache/dev-perl/IO-Handle-Util-0.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-String virtual/perl-Scalar-List-Utils dev-perl/Sub-Exporter dev-perl/asa virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/IO-Handle-Util-0.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6d9332ef3edbc76d0907425f836d677f
+_md5_=b22488efe43d3952aaa0ef35026c471e
diff --git a/metadata/md5-cache/dev-perl/IO-Interactive-1.22.0 b/metadata/md5-cache/dev-perl/IO-Interactive-1.22.0
index 9d3935a04111..202b5f107aea 100644
--- a/metadata/md5-cache/dev-perl/IO-Interactive-1.22.0
+++ b/metadata/md5-cache/dev-perl/IO-Interactive-1.22.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-version-0.780.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.022.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=265c84f3cfb81bea22a67bb2b78854d4
+_md5_=a03f3fe9a48758f7f7289eb6c918ca9d
diff --git a/metadata/md5-cache/dev-perl/IO-Pager-0.390.0 b/metadata/md5-cache/dev-perl/IO-Pager-0.390.0
index 838ec7e92a57..d915b7c57923 100644
--- a/metadata/md5-cache/dev-perl/IO-Pager-0.390.0
+++ b/metadata/md5-cache/dev-perl/IO-Pager-0.390.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-perl/File-Which virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.39.tgz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2d017c00b29e69547c4bc4d40c7eea42
+_md5_=71dd9b0e8390a57dd3c6114a76957410
diff --git a/metadata/md5-cache/dev-perl/IO-Prompt-0.997.4 b/metadata/md5-cache/dev-perl/IO-Prompt-0.997.4
index f309e0eaa75c..f3e9c62d74c4 100644
--- a/metadata/md5-cache/dev-perl/IO-Prompt-0.997.4
+++ b/metadata/md5-cache/dev-perl/IO-Prompt-0.997.4
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO dev-perl/TermReadKey dev-perl/Want dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCONWAY/IO-Prompt-0.997004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9964494d7b7e3d41ca9e36f8921dbfae
+_md5_=f94d0a62e99c66d5102fc66f64f41783
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-PortState-0.30.0 b/metadata/md5-cache/dev-perl/IO-Socket-PortState-0.30.0
index db7429795941..3f9e7fd523a0 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-PortState-0.30.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-PortState-0.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMUEY/IO-Socket-PortState-0.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5248bfac8ee1a2a568330d5ba74d6413
+_md5_=6be35c35b0bf681b4a951815168c3658
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-Timeout-0.320.0 b/metadata/md5-cache/dev-perl/IO-Socket-Timeout-0.320.0
index e40561963434..ace8d2ecb829 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-Timeout-0.320.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-Timeout-0.320.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/PerlIO-via-Timeout-0.320.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAMS/IO-Socket-Timeout-0.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=27c1c77c8d745d410eac85f2cbdfd4a7
+_md5_=499d8c7d5c4fc0823502ae2db2890b2f
diff --git a/metadata/md5-cache/dev-perl/IO-Stty-0.30.0 b/metadata/md5-cache/dev-perl/IO-Stty-0.30.0
index c9a7ee384b98..40c982688bf4 100644
--- a/metadata/md5-cache/dev-perl/IO-Stty-0.30.0
+++ b/metadata/md5-cache/dev-perl/IO-Stty-0.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Stty-0.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=87c46aacae88ef34d735682d6e0a13bd
+_md5_=e90aef7b096740f404083547d5342f0b
diff --git a/metadata/md5-cache/dev-perl/IO-TieCombine-1.5.0 b/metadata/md5-cache/dev-perl/IO-TieCombine-1.5.0
index 3fe0482bfe3c..8da18e78f06f 100644
--- a/metadata/md5-cache/dev-perl/IO-TieCombine-1.5.0
+++ b/metadata/md5-cache/dev-perl/IO-TieCombine-1.5.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=71d7f16014eb48f6b9417eeaf02813e8
+_md5_=002066876bcd314fb866572e9e6a3471
diff --git a/metadata/md5-cache/dev-perl/IPC-Run-0.960.0 b/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
index b0cdde7ab250..e7fd39d9d6f5 100644
--- a/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
+++ b/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/IO-Tty-1.80.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.96.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1647b9733808222355c79c7dc61574cd
+_md5_=95c716b9988f0783f53c92fa25823a0c
diff --git a/metadata/md5-cache/dev-perl/IPC-Run3-0.48.0 b/metadata/md5-cache/dev-perl/IPC-Run3-0.48.0
index c303a4264dde..e8dcdaf224df 100644
--- a/metadata/md5-cache/dev-perl/IPC-Run3-0.48.0
+++ b/metadata/md5-cache/dev-perl/IPC-Run3-0.48.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD-2 Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/IPC-Run3-0.048.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5b555cb230fc45292701371e6d322888
+_md5_=8f72ead02415a36c7f6a0167c2bdb48f
diff --git a/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1 b/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
index e6d60b8ee518..0d99ef9e06a1 100644
--- a/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/IPC-ShareLite-0.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f5a1c9f4ad92e5383814dfee7c82456
+_md5_=1bc7003811654c1a523de4a2ab454a62
diff --git a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0 b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
index d5df4b1d703c..c713f819e012 100644
--- a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
+++ b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJF/IPC-System-Simple-1.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8016f0d6a94eda1054c1fe2b1ce7e848
+_md5_=344a7e3ee5926f2ef31b831d40356ffa
diff --git a/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1 b/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
index cd786dc414cf..252179f8bbbc 100644
--- a/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=media-libs/imlib2-1 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Image-Imlib2-2.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f12e9d52be64cccc62747a0113763fb6
+_md5_=45feb1d9f3a25eadea20e4929aa750f9
diff --git a/metadata/md5-cache/dev-perl/Image-Sane-0.140.0 b/metadata/md5-cache/dev-perl/Image-Sane-0.140.0
index ddcf59dbde32..205786f03ea3 100644
--- a/metadata/md5-cache/dev-perl/Image-Sane-0.140.0
+++ b/metadata/md5-cache/dev-perl/Image-Sane-0.140.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Exception-Class dev-perl/Readonly >=media-gfx/sane-backends-1.0.19 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RATCLIFFE/Image-Sane-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b1eff2be4d5928ed829bf8a71ba65738
+_md5_=884e08637e66b06e04de12c27eeb82c8
diff --git a/metadata/md5-cache/dev-perl/Image-Scale-0.130.0 b/metadata/md5-cache/dev-perl/Image-Scale-0.130.0
index 0f0254bc35ae..bc88311a5906 100644
--- a/metadata/md5-cache/dev-perl/Image-Scale-0.130.0
+++ b/metadata/md5-cache/dev-perl/Image-Scale-0.130.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg:0 ) gif? ( media-libs/giflib ) dev-lang/perl:=
 REQUIRED_USE=|| ( jpeg png )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AG/AGRUNDMA/Image-Scale-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3cac360103938b333f067fa073e31b33
+_md5_=b971b16e1a5cf74bfbc1c81081d94a71
diff --git a/metadata/md5-cache/dev-perl/Image-Size-3.300.0 b/metadata/md5-cache/dev-perl/Image-Size-3.300.0
index f55f0aaba20d..52e2c8878934 100644
--- a/metadata/md5-cache/dev-perl/Image-Size-3.300.0
+++ b/metadata/md5-cache/dev-perl/Image-Size-3.300.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO-Compress >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/Image-Size-3.300.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b337bbe71a2b33e5412e4c77d52c88e9
+_md5_=88c656bd2c7cb83e75dd3884c918528f
diff --git a/metadata/md5-cache/dev-perl/Import-Into-1.2.5 b/metadata/md5-cache/dev-perl/Import-Into-1.2.5
index f362eb711afe..d0d078940b96 100644
--- a/metadata/md5-cache/dev-perl/Import-Into-1.2.5
+++ b/metadata/md5-cache/dev-perl/Import-Into-1.2.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~ppc x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Module-Runtime dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Import-Into-1.002005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=faeb7342c74fdd6a4255083f542a2c98
+_md5_=ba294ff8fa51139108d606c624ef821f
diff --git a/metadata/md5-cache/dev-perl/Importer-0.24.0 b/metadata/md5-cache/dev-perl/Importer-0.24.0
index 469d37726ae8..5345e426eeba 100644
--- a/metadata/md5-cache/dev-perl/Importer-0.24.0
+++ b/metadata/md5-cache/dev-perl/Importer-0.24.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.024.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ccaeb0ff80e2517ad4810719fb1aa71e
+_md5_=c32d3554ce794e18cf6e7bafee30a1ae
diff --git a/metadata/md5-cache/dev-perl/Inline-0.500.0-r1 b/metadata/md5-cache/dev-perl/Inline-0.500.0-r1
index 44befc1dc56b..21725a743899 100644
--- a/metadata/md5-cache/dev-perl/Inline-0.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Inline-0.500.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec dev-perl/Parse-RecDescent dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SISYPHUS/Inline-0.50.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68286ea957e17fb9990bb822cb77b9e0
+_md5_=135711fdcb0bb16a420ea465ee736c12
diff --git a/metadata/md5-cache/dev-perl/Inline-0.800.0 b/metadata/md5-cache/dev-perl/Inline-0.800.0
index 835db7ece078..293ce21a5363 100644
--- a/metadata/md5-cache/dev-perl/Inline-0.800.0
+++ b/metadata/md5-cache/dev-perl/Inline-0.800.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Inline-0.80.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6c5975bfd74051f9948714c3bc2e02e
+_md5_=834a0143228c0a87a02fe01adb24d620
diff --git a/metadata/md5-cache/dev-perl/Inline-C-0.780.0 b/metadata/md5-cache/dev-perl/Inline-C-0.780.0
index 360f8c20e216..d87d72b5366c 100644
--- a/metadata/md5-cache/dev-perl/Inline-C-0.780.0
+++ b/metadata/md5-cache/dev-perl/Inline-C-0.780.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-7 >=virtual/perl-File-Spec-0.800.0 >=dev-perl/Inline-0.790.0 >=dev-perl/Parse-RecDescent-1.967.9 >=dev-perl/Pegex-0.580.0 !<dev-perl/Inline-0.510.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.78.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e15b6e8272499a4149131b9e416c7fd8
+_md5_=7762040602479153c9c380870b6e2c53
diff --git a/metadata/md5-cache/dev-perl/Inline-Files-0.690.0 b/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
index 42997be2aa82..0d7ebcf72ad2 100644
--- a/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
+++ b/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Inline-Files-0.69.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9f731de1c24a176b6a400745e701606
+_md5_=848908614ebf011ecc5184bd1045c17e
diff --git a/metadata/md5-cache/dev-perl/Inline-Python-0.560.0 b/metadata/md5-cache/dev-perl/Inline-Python-0.560.0
index 24c0f435bfe3..6b2c889609df 100644
--- a/metadata/md5-cache/dev-perl/Inline-Python-0.560.0
+++ b/metadata/md5-cache/dev-perl/Inline-Python-0.560.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.500.0 >=dev-perl/Inline-0.460.0 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-lang/perl:=
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NINE/Inline-Python-0.56.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0fe72f6bb3204e2d6fcb9bf49c0772a8
+_md5_=c6f564dd19ac320fd8bb4274c6815b77
diff --git a/metadata/md5-cache/dev-perl/JSON-2.900.0 b/metadata/md5-cache/dev-perl/JSON-2.900.0
index e4728588bd6e..229e41582027 100644
--- a/metadata/md5-cache/dev-perl/JSON-2.900.0
+++ b/metadata/md5-cache/dev-perl/JSON-2.900.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.90.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=763675a293f2b46b50c6698054f4caf9
+_md5_=3e02dd987bffef95a01b023f06339632
diff --git a/metadata/md5-cache/dev-perl/JSON-2.940.0 b/metadata/md5-cache/dev-perl/JSON-2.940.0
index 8cc1cc4498bd..3984f4c9dfb9 100644
--- a/metadata/md5-cache/dev-perl/JSON-2.940.0
+++ b/metadata/md5-cache/dev-perl/JSON-2.940.0
@@ -7,7 +7,8 @@ IUSE=test +xs examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=xs? ( >=dev-perl/JSON-XS-2.340.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-2.94.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c3dd97717dbd3ece493cfdaca772ad76
+_md5_=a194bdc1468be1eae9f4c85107992204
diff --git a/metadata/md5-cache/dev-perl/JSON-Any-1.390.0 b/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
index 764b838d8718..780cf5fbb429 100644
--- a/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
+++ b/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~mips ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp || ( >=dev-perl/JSON-XS-2.3 virtual/perl-JSON-PP dev-perl/JSON ) dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f7d055d9494fba67ae3c9fe80c64b592
+_md5_=9b0a7f793a62badc0208d54c73430c33
diff --git a/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9 b/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
index 6ca7f7878e5a..95c77ce39add 100644
--- a/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
+++ b/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.3.9
@@ -7,7 +7,8 @@ IUSE=test +xs
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-JSON-PP-2.273.0 virtual/perl-Scalar-List-Utils xs? ( || ( >=dev-perl/Cpanel-JSON-XS-2.331.0 >=dev-perl/JSON-XS-3.0.0 ) ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.003009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=56f0cf00a10f61c06fbb1ec9f9e08df2
+_md5_=3c1ca3f9065fb70a6f234002957f12e2
diff --git a/metadata/md5-cache/dev-perl/JSON-Parse-0.550.0 b/metadata/md5-cache/dev-perl/JSON-Parse-0.550.0
index f3d8b4e51dea..dd340f58e2b1 100644
--- a/metadata/md5-cache/dev-perl/JSON-Parse-0.550.0
+++ b/metadata/md5-cache/dev-perl/JSON-Parse-0.550.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Getopt-Long dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.55.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a5ec6015a0897f4cc8f5ecb322e027fd
+_md5_=855fffaee3244c94d629a8c9824b06d7
diff --git a/metadata/md5-cache/dev-perl/JSON-RPC-1.60.0 b/metadata/md5-cache/dev-perl/JSON-RPC-1.60.0
index c63236940c30..5e9165a4a7ed 100644
--- a/metadata/md5-cache/dev-perl/JSON-RPC-1.60.0
+++ b/metadata/md5-cache/dev-perl/JSON-RPC-1.60.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/JSON-XS ) dev-perl/CGI dev-perl/Class-Accessor-Lite dev-perl/HTTP-Message dev-perl/JSON dev-perl/libwww-perl dev-perl/Plack dev-perl/Router-Simple dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMAKI/JSON-RPC-1.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c6338ae4982597bb4d43061b7052394c
+_md5_=81befb414cf0bd7f65ac21cb9c2d4fc6
diff --git a/metadata/md5-cache/dev-perl/JSON-XS-3.40.0 b/metadata/md5-cache/dev-perl/JSON-XS-3.40.0
index 7e70007ce9a0..31a5488529cd 100644
--- a/metadata/md5-cache/dev-perl/JSON-XS-3.40.0
+++ b/metadata/md5-cache/dev-perl/JSON-XS-3.40.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Types-Serialiser dev-perl/common-sense !<dev-perl/JSON-2.900.0 !<dev-perl/JSON-Any-1.310.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-3.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=093920eaa27374fbc1127d85961019fd
+_md5_=3dec8520a7b236acbf23e091d06fc1ca
diff --git a/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1 b/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
index 6a6e2fb1456f..2c29fe4336ff 100644
--- a/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
+++ b/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/JSON-XS dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/JSON-XS-VersionOneAndTwo-0.31.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45fe6b47c3babfd1b5e1157f6cd97037
+_md5_=dfcf3ca30bb392e09fbe58f5c4ff36fc
diff --git a/metadata/md5-cache/dev-perl/JavaScript-Minifier-1.140.0 b/metadata/md5-cache/dev-perl/JavaScript-Minifier-1.140.0
index 06cf1cd3c721..0cfcc1490fcd 100644
--- a/metadata/md5-cache/dev-perl/JavaScript-Minifier-1.140.0
+++ b/metadata/md5-cache/dev-perl/JavaScript-Minifier-1.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZO/ZOFFIX/JavaScript-Minifier-1.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5445ab5d21ed839d0529f220b3bc7ef2
+_md5_=37e2bf916ac7a2c6191c10f662979221
diff --git a/metadata/md5-cache/dev-perl/JavaScript-Packer-2.30.0 b/metadata/md5-cache/dev-perl/JavaScript-Packer-2.30.0
index 6c5810b72bb1..98093be052fa 100644
--- a/metadata/md5-cache/dev-perl/JavaScript-Packer-2.30.0
+++ b/metadata/md5-cache/dev-perl/JavaScript-Packer-2.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Regexp-RegGrp-1.1.1_rc dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/JavaScript-Packer-2.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=34f417314690f15db1b4fe9decfd3e3d
+_md5_=38127cd31864df3f1cc0e3fa3dc39a39
diff --git a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2 b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
index 1faf85cd6194..2dc475ac73e0 100644
--- a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
+++ b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/libwww-perl-5.805.0 >=dev-perl/URI-1.350.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/LWP-Online-1.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5b4a44d71058c4204962b74c60b7c3df
+_md5_=044896cfb5829dcb99fd262f371d4303
diff --git a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.70.0 b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.70.0
index 56d0a2b603d2..b8bd6594f357 100644
--- a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.70.0
+++ b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.70.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-misc/ca-certificates >=dev-perl/IO-Socket-SSL-1.540.0 >=dev-perl/libwww-perl-6.60.0 >=dev-perl/Net-HTTP-6 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bf74542cb84fb5fe637e04914ae3d637
+_md5_=efc21501125f8f1634da9bdb6483f1a8
diff --git a/metadata/md5-cache/dev-perl/LWP-UserAgent-Cached-0.60.0-r1 b/metadata/md5-cache/dev-perl/LWP-UserAgent-Cached-0.60.0-r1
index aeae00e1f265..5e60e3999a14 100644
--- a/metadata/md5-cache/dev-perl/LWP-UserAgent-Cached-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/LWP-UserAgent-Cached-0.60.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLEG/LWP-UserAgent-Cached-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4b83bdfc2f134159128a07c69a8aa606
+_md5_=da10c1aca80f5c585bc4260a2748ead1
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4 b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
index ba686c230308..cdf210ebca28 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
+++ b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/File-pushd virtual/perl-Getopt-Long dev-perl/Readonly virtual/perl-parent virtual/latex-base dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Driver-0.200.4.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5152f9f200a3944232008429e47b97eb
+_md5_=9f58e4312103673985802270c4b2e42d
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.300.2 b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.300.2
index 435266f256f2..054ac2b7e9ee 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.300.2
+++ b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.300.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/File-pushd virtual/perl-Getopt-Long dev-perl/Readonly virtual/perl-parent virtual/latex-base dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Driver-0.300.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9f3b8036091a25041ddb77efa35a87ac
+_md5_=95456978423f100cfea2f2214a43d5c1
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6-r1 b/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6-r1
index 86ccdc6f28e9..2476a81efe83 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6-r1
+++ b/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Getopt-Long dev-perl/HTML-Parser dev-perl/Pod-LaTeX dev-perl/Readonly dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Encode-0.091.6.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d62deec3674bffb0b94a535c0dfbeab9
+_md5_=d62416c1e3f2439edea7f605b9aee253
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Encode-0.92.0 b/metadata/md5-cache/dev-perl/LaTeX-Encode-0.92.0
index 8abad4613ac8..2b70b83dcba7 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Encode-0.92.0
+++ b/metadata/md5-cache/dev-perl/LaTeX-Encode-0.92.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Getopt-Long dev-perl/HTML-Parser dev-perl/Pod-LaTeX dev-perl/Readonly dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Encode-0.092.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b3512a587ae16011bff6c6ee04ac9a71
+_md5_=be3537bc7a7ac7bd485ec53476edc715
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6 b/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
index 3cbe91a22f76..05321519d25e 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
+++ b/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Carp dev-perl/Module-Pluggable dev-perl/Moose dev-perl/MooseX-FollowPBP virtual/perl-Scalar-List-Utils dev-perl/Template-Toolkit virtual/perl-version dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LI/LIMAONE/LaTeX-Table-v1.0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1d363a5988df387f0948d0e1fbca42a5
+_md5_=21c128b60f588dbba04e520c495b4c48
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6-r1 b/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6-r1
index b67bcdcf2c27..750c66539a9f 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6-r1
+++ b/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6-r1
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Carp dev-perl/Module-Pluggable dev-perl/Moose dev-perl/MooseX-FollowPBP virtual/perl-Scalar-List-Utils dev-perl/Template-Toolkit virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LI/LIMAONE/LaTeX-Table-v1.0.6.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cc40ac23fcfda00a8e995098ad0fa4f1
+_md5_=4cb493b2dfce51449ee25919e10dc1c6
diff --git a/metadata/md5-cache/dev-perl/Lab-Measurement-3.661 b/metadata/md5-cache/dev-perl/Lab-Measurement-3.661
index b8f5eb3d83eb..f26e7d1d64e2 100644
--- a/metadata/md5-cache/dev-perl/Lab-Measurement-3.661
+++ b/metadata/md5-cache/dev-perl/Lab-Measurement-3.661
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 dev-perl/MooseX-StrictConstructor >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes dev-perl/Time-Monotonic virtual/perl-Time-Piece >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-perl/Lab-VXI11 dev-perl/USB-TMC dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AK/AKHUETTEL/Lab-Measurement-3.661.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=528dac5a2073dfb46886899e24cae00d
+_md5_=20b58ea3b418b1d45027ebd61b9f4acc
diff --git a/metadata/md5-cache/dev-perl/Lab-Measurement-3.682 b/metadata/md5-cache/dev-perl/Lab-Measurement-3.682
index 10a4dadec64d..fe7f67277d90 100644
--- a/metadata/md5-cache/dev-perl/Lab-Measurement-3.682
+++ b/metadata/md5-cache/dev-perl/Lab-Measurement-3.682
@@ -8,7 +8,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 dev-perl/MooseX-StrictConstructor >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes dev-perl/Time-Monotonic virtual/perl-Time-Piece >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-perl/Lab-VXI11 dev-perl/USB-TMC dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AK/AKHUETTEL/Lab-Measurement-3.682.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4da4e754fd5fd724a86b5cba28a277cf
+_md5_=9a474c7d88f4ef99ebf019d6a3f1487e
diff --git a/metadata/md5-cache/dev-perl/Lab-Measurement-9999 b/metadata/md5-cache/dev-perl/Lab-Measurement-9999
index cc294fb4472a..f2ebbccac128 100644
--- a/metadata/md5-cache/dev-perl/Lab-Measurement-9999
+++ b/metadata/md5-cache/dev-perl/Lab-Measurement-9999
@@ -8,6 +8,7 @@ IUSE=test examples
 LICENSE=|| ( Artistic GPL-1+ )
 PROPERTIES=live
 RDEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 dev-perl/MooseX-StrictConstructor >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes dev-perl/Time-Monotonic virtual/perl-Time-Piece >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-perl/Lab-VXI11 dev-perl/USB-TMC dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4da4e754fd5fd724a86b5cba28a277cf
+_md5_=9a474c7d88f4ef99ebf019d6a3f1487e
diff --git a/metadata/md5-cache/dev-perl/Lexical-Persistence-1.23.0 b/metadata/md5-cache/dev-perl/Lexical-Persistence-1.23.0
index 89e87be295b6..3bc8c5fb9702 100644
--- a/metadata/md5-cache/dev-perl/Lexical-Persistence-1.23.0
+++ b/metadata/md5-cache/dev-perl/Lexical-Persistence-1.23.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/PadWalker-1.960.0 >=dev-perl/Devel-LexAlias-0.50.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/Lexical-Persistence-1.023.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4a6057b9c3db20f8f3c05555970b760f
+_md5_=1e1bed8a2931a4825d3ff895a21367e3
diff --git a/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0 b/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
index d52dc5cdf613..7e67ee6ad98e 100644
--- a/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
+++ b/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/B-Hooks-OP-Check-0.190.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Lexical-SealRequireHints-0.011.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=05f546774ccf31deba190279038a25ac
+_md5_=be432f4cdc72d7284efb48d367d6782b
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.902.0 b/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.902.0
index fd40fc877149..d101a39e082e 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.902.0
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.902.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.902.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=672179cf1dad3542b66e12a22ca0a530
+_md5_=d78af4fac2bd4809353e8e43e5cd1435
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-NameCase-1.190.0-r1 b/metadata/md5-cache/dev-perl/Lingua-EN-NameCase-1.190.0-r1
index 1fc029f318f2..ec3185e43c75 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-NameCase-1.190.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-NameCase-1.190.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BA/BARBIE/Lingua-EN-NameCase-1.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9f3f7ac6b20244722d26ae55293d6e38
+_md5_=e05047d301583ec9030f2b2c68c653a4
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.330.0 b/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.330.0
index fb70b1227721..f60764dc1737 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.330.0
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.330.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Parse-RecDescent-1 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KI/KIMRYAN/Lingua-EN-NameParse-1.33.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6425f79dea59747f6b1fe99deffad2ac
+_md5_=4c5fe8d055ec1594f7b528221cbdeda3
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.360.0 b/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.360.0
index f00a26ce93f1..1fbfc7da2a5b 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.360.0
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.360.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Parse-RecDescent-1 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KI/KIMRYAN/Lingua-EN-NameParse-1.36.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=13dc1e030410c57dafe2e27c619534aa
+_md5_=75a6920b517783fb07b7897155e23263
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.40.0 b/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.40.0
index 514527974f7f..e12d3e77a892 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.40.0
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-Numbers-Ordinate-1.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ef7ea479a44e80976bc54bbfe3eb82bd
+_md5_=b2f650e63dc612a3b508f7031b43df73
diff --git a/metadata/md5-cache/dev-perl/Lingua-PT-Stemmer-0.20.0 b/metadata/md5-cache/dev-perl/Lingua-PT-Stemmer-0.20.0
index 5248d37fde80..8aec4b00ca44 100644
--- a/metadata/md5-cache/dev-perl/Lingua-PT-Stemmer-0.20.0
+++ b/metadata/md5-cache/dev-perl/Lingua-PT-Stemmer-0.20.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ~ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Lingua-PT-Stemmer-0.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3f699f059caf75c752add33ed43033da
+_md5_=44dae5a4f55bbd23b96583c99238f14e
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-Ru-0.40.0 b/metadata/md5-cache/dev-perl/Lingua-Stem-Ru-0.40.0
index 52123fb3afbb..0418f8f197c9 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-Ru-0.40.0
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-Ru-0.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ~ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Lingua-Stem-Ru-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dc52604a0593669eee4d5ea51c338cbc
+_md5_=3030af45c0a92069a9c2113047e4cc3c
diff --git a/metadata/md5-cache/dev-perl/Linux-Distribution-0.230.0 b/metadata/md5-cache/dev-perl/Linux-Distribution-0.230.0
index 742c86815ce1..1d8c1b803839 100644
--- a/metadata/md5-cache/dev-perl/Linux-Distribution-0.230.0
+++ b/metadata/md5-cache/dev-perl/Linux-Distribution-0.230.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Linux-Distribution-0.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=057e1323dd597d0bdb6ca8dbf5b073dd
+_md5_=345d9ae7a341f650c05875df77a440cf
diff --git a/metadata/md5-cache/dev-perl/Linux-PipeMagic-0.30.0 b/metadata/md5-cache/dev-perl/Linux-PipeMagic-0.30.0
index 8f6d29be99cd..20cdd2a698d9 100644
--- a/metadata/md5-cache/dev-perl/Linux-PipeMagic-0.30.0
+++ b/metadata/md5-cache/dev-perl/Linux-PipeMagic-0.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DL/DLAMBLEY/Linux-PipeMagic-0.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cdfa514b5872efa6ec1c85b418ff915a
+_md5_=96a9dfbcfdfea9d4993ba20efd1b5a35
diff --git a/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0 b/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
index 1886f4eef8b3..3794d65d980f 100644
--- a/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
+++ b/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/File-Path-Expand >=dev-perl/Moo-1.0.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MG/MGRIMES/Lirc-Client-2.02.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=192633e047e1a8937dec9d7e12713e86
+_md5_=452ec5b383734c15dee2a4a83b881e79
diff --git a/metadata/md5-cache/dev-perl/List-AllUtils-0.140.0 b/metadata/md5-cache/dev-perl/List-AllUtils-0.140.0
index 0e5aaab8df92..4165ffb807a9 100644
--- a/metadata/md5-cache/dev-perl/List-AllUtils-0.140.0
+++ b/metadata/md5-cache/dev-perl/List-AllUtils-0.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/List-SomeUtils-0.500.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/List-UtilsBy-0.100.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=748d77820ee4ab06228314a4a20dfa75
+_md5_=81306c96cb1d10921a48829cb7a1aab4
diff --git a/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0 b/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
index 7ed6b8771555..c2a51fb5915f 100644
--- a/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
+++ b/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/List-MoreUtils-0.280.0 >=virtual/perl-Scalar-List-Utils-1.310.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.08.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a49d5f1aec5f33ab8971290c76ed39a
+_md5_=4828e5d8502fe41b75dd42818597c430
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-0.418.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-0.418.0
index 30ec130b4971..8943773c1638 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-0.418.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-0.418.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 PDEPEND=xs? ( dev-perl/List-MoreUtils-XS )
 RDEPEND=>=dev-perl/Exporter-Tiny-0.38.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.418.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=72798a482eadd0f282ea2044e3c001a7
+_md5_=dc85883b71b9845bedc9437af9c8ff5c
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-0.419.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-0.419.0
index 795b21f4aac8..d52830f79a15 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-0.419.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-0.419.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 PDEPEND=xs? ( dev-perl/List-MoreUtils-XS )
 RDEPEND=>=dev-perl/Exporter-Tiny-0.38.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.419.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c099e510ab996c50000c07c902d186d1
+_md5_=fed9a2e95286c5fa3e85b9fb2a470dd2
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-0.426.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-0.426.0
index 575925e15090..71947b9b6d57 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-0.426.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-0.426.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 PDEPEND=xs? ( >=dev-perl/List-MoreUtils-XS-0.426.0 )
 RDEPEND=>=dev-perl/Exporter-Tiny-0.38.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.426.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b12e03612733e01a3599ee2e9aa40c06
+_md5_=4bcc021c73776e8948eaa137731fd0f9
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.418.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.418.0
index 331e6f0713a8..b28b9e1578c9 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.418.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.418.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/List-MoreUtils-0.417.1 >=virtual/perl-XSLoader-0.220.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.418.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=aefe4ae2584dc15abd3152b291600a74
+_md5_=6bd6b8a782ca563a3c038d3622b112d6
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.426.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.426.0
index 2778058debee..fa1c255f0044 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.426.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.426.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/List-MoreUtils-0.417.1 >=virtual/perl-XSLoader-0.220.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.426.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=48be7a13db0d3792d4ec0c9b49d0ad7b
+_md5_=c23c256902b611bbdefa87e43b218ec4
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.428.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.428.0
index e735d5982fc1..197c5249b310 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.428.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.428.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/List-MoreUtils-0.417.1 >=virtual/perl-XSLoader-0.220.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d456b0907afe65e56ddc9c257c0c6793
+_md5_=b1f78b3401fe0aba33e962c2dff482d5
diff --git a/metadata/md5-cache/dev-perl/List-SomeUtils-0.560.0 b/metadata/md5-cache/dev-perl/List-SomeUtils-0.560.0
index a73d72aa77c5..6a2fb9cb8dfc 100644
--- a/metadata/md5-cache/dev-perl/List-SomeUtils-0.560.0
+++ b/metadata/md5-cache/dev-perl/List-SomeUtils-0.560.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/Module-Implementation >=dev-perl/List-SomeUtils-XS-0.550.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-0.56.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=453fe33d7181f31fc67a6f39f4d19817
+_md5_=72b79c5396f6957eb3901f86b9e7e275
diff --git a/metadata/md5-cache/dev-perl/List-SomeUtils-XS-0.550.0 b/metadata/md5-cache/dev-perl/List-SomeUtils-XS-0.550.0
index ff864201df9a..f74590a0e165 100644
--- a/metadata/md5-cache/dev-perl/List-SomeUtils-XS-0.550.0
+++ b/metadata/md5-cache/dev-perl/List-SomeUtils-XS-0.550.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-XS-0.55.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d1acd7f869afb663ac74e533a63844fa
+_md5_=6af04cc652c1ba8f5b0f446b49b839a2
diff --git a/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0 b/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
index 0967dbb44509..ab6a8d69ebda 100644
--- a/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
+++ b/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a4cc239e90521cf0e1f4a6d0302e712
+_md5_=6464b2eef2ef88853f5da0974537aaa0
diff --git a/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0 b/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
index 8d790c0f68ba..2c2f71357ec3 100644
--- a/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
+++ b/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=virtual/perl-Locale-Maketext-1.170.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-1.00.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=788067a56cc6b8e3a5a23258e543f124
+_md5_=5632ed9588d6a82fca039f54f5f6d760
diff --git a/metadata/md5-cache/dev-perl/Locale-Msgfmt-0.150.0-r1 b/metadata/md5-cache/dev-perl/Locale-Msgfmt-0.150.0-r1
index 40b38b6576ed..47d905f1852c 100644
--- a/metadata/md5-cache/dev-perl/Locale-Msgfmt-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/Locale-Msgfmt-0.150.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AZ/AZAWAWI/Locale-Msgfmt-0.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a23d584dfb165df1f4f9f35ecff6895e
+_md5_=ecada2d1ded7e862a5158fc248899111
diff --git a/metadata/md5-cache/dev-perl/Locale-PO-0.270.0 b/metadata/md5-cache/dev-perl/Locale-PO-0.270.0
index 3240810d7ed1..ceaa731b95e3 100644
--- a/metadata/md5-cache/dev-perl/Locale-PO-0.270.0
+++ b/metadata/md5-cache/dev-perl/Locale-PO-0.270.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-devel/gettext dev-perl/File-Slurp dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e96e6888b83e9a307847ae6a889afb0
+_md5_=2a8817c80754cb361a27d4494199480a
diff --git a/metadata/md5-cache/dev-perl/Log-Agent-1.1.0 b/metadata/md5-cache/dev-perl/Log-Agent-1.1.0
index 8d26e54186a3..220de262c5bb 100644
--- a/metadata/md5-cache/dev-perl/Log-Agent-1.1.0
+++ b/metadata/md5-cache/dev-perl/Log-Agent-1.1.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MR/MROGASKI/Log-Agent-1.001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ad9455f55d37642af090c89858aa1fe5
+_md5_=e69e7a47b13f07cb2a16caf0d46e4516
diff --git a/metadata/md5-cache/dev-perl/Log-Any-1.701.0 b/metadata/md5-cache/dev-perl/Log-Any-1.701.0
index 604c089bb025..1e33cc220b1b 100644
--- a/metadata/md5-cache/dev-perl/Log-Any-1.701.0
+++ b/metadata/md5-cache/dev-perl/Log-Any-1.701.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-IO virtual/perl-Storable virtual/perl-Sys-Syslog virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.701.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=96460aa1d1cbccfee1a7ef1edf4c6650
+_md5_=716265159152bdb0372977d10ea95177
diff --git a/metadata/md5-cache/dev-perl/Log-Dispatch-2.540.0 b/metadata/md5-cache/dev-perl/Log-Dispatch-2.540.0
index ad04df29dee2..e6c0f71c6192 100644
--- a/metadata/md5-cache/dev-perl/Log-Dispatch-2.540.0
+++ b/metadata/md5-cache/dev-perl/Log-Dispatch-2.540.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc x86 ~ppc-aix
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp dev-perl/Devel-GlobalDestruction >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Encode dev-perl/Module-Runtime virtual/perl-IO >=virtual/perl-JSON-PP-2.273.0 >=dev-perl/Params-Validate-1.30.0 virtual/perl-Scalar-List-Utils >=virtual/perl-Sys-Syslog-0.280.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.54.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=86a6cb8bc408d16e7e58cfcadaf944b8
+_md5_=778b2af2b9d85e040856ce25faffbe62
diff --git a/metadata/md5-cache/dev-perl/Log-Dispatch-2.580.0 b/metadata/md5-cache/dev-perl/Log-Dispatch-2.580.0
index 3a2c58a52c85..736f1c83677e 100644
--- a/metadata/md5-cache/dev-perl/Log-Dispatch-2.580.0
+++ b/metadata/md5-cache/dev-perl/Log-Dispatch-2.580.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-aix
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp dev-perl/Devel-GlobalDestruction >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Encode virtual/perl-Exporter virtual/perl-IO dev-perl/Module-Runtime >=dev-perl/Params-Validate-1.30.0 virtual/perl-Scalar-List-Utils >=virtual/perl-Sys-Syslog-0.280.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.58.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d413a067001138d18a1ec1421fc11073
+_md5_=3802e5cfdf18da2ba244d23fef888d51
diff --git a/metadata/md5-cache/dev-perl/Log-Dispatch-2.630.0 b/metadata/md5-cache/dev-perl/Log-Dispatch-2.630.0
index a292e43aa457..117af2d230a8 100644
--- a/metadata/md5-cache/dev-perl/Log-Dispatch-2.630.0
+++ b/metadata/md5-cache/dev-perl/Log-Dispatch-2.630.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~ppc-aix
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp dev-perl/Devel-GlobalDestruction >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Encode virtual/perl-Exporter virtual/perl-IO dev-perl/Module-Runtime dev-perl/Params-ValidationCompiler virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.320.0 >=virtual/perl-Sys-Syslog-0.280.0 dev-perl/Try-Tiny dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.63.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=826cfade39b89856f690404d13cdd9e7
+_md5_=219ce266aa335639c7a5022005e75c97
diff --git a/metadata/md5-cache/dev-perl/Log-Dispatch-2.670.0 b/metadata/md5-cache/dev-perl/Log-Dispatch-2.670.0
index cd769a074238..ccf61ca6c467 100644
--- a/metadata/md5-cache/dev-perl/Log-Dispatch-2.670.0
+++ b/metadata/md5-cache/dev-perl/Log-Dispatch-2.670.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp dev-perl/Devel-GlobalDestruction >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Encode virtual/perl-Exporter virtual/perl-IO dev-perl/Module-Runtime dev-perl/Params-ValidationCompiler virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.320.0 >=virtual/perl-Sys-Syslog-0.280.0 dev-perl/Try-Tiny dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.67.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bebbe830f420e20a4688e9194bf8f088
+_md5_=d7bdf5bc2c1dfe965cf79aed8c895996
diff --git a/metadata/md5-cache/dev-perl/Log-Dispatch-Array-1.3.0 b/metadata/md5-cache/dev-perl/Log-Dispatch-Array-1.3.0
index 7c05e37055e5..01a8e445932d 100644
--- a/metadata/md5-cache/dev-perl/Log-Dispatch-Array-1.3.0
+++ b/metadata/md5-cache/dev-perl/Log-Dispatch-Array-1.3.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Log-Dispatch virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=57673dafceafbe6f5688f10a8e1778ad
+_md5_=276e793c41c376b141b26bf45715b150
diff --git a/metadata/md5-cache/dev-perl/Log-Dispatchouli-2.15.0 b/metadata/md5-cache/dev-perl/Log-Dispatchouli-2.15.0
index 81098a0394e6..60989956f995 100644
--- a/metadata/md5-cache/dev-perl/Log-Dispatchouli-2.15.0
+++ b/metadata/md5-cache/dev-perl/Log-Dispatchouli-2.15.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-perl/Log-Dispatch dev-perl/Log-Dispatch-Array dev-perl/Params-Util virtual/perl-Scalar-List-Utils dev-perl/String-Flogger dev-perl/Sub-Exporter >=dev-perl/Sub-Exporter-GlobExporter-0.2.0 >=virtual/perl-Sys-Syslog-0.160.0 >=dev-perl/Try-Tiny-0.40.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.015.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f0235cb6c2168f4dac0cacfe8054a370
+_md5_=483749703ee86b719271bb88cf149479
diff --git a/metadata/md5-cache/dev-perl/Log-Log4perl-1.490.0 b/metadata/md5-cache/dev-perl/Log-Log4perl-1.490.0
index 48937768a8d7..aba1818e4b2b 100644
--- a/metadata/md5-cache/dev-perl/Log-Log4perl-1.490.0
+++ b/metadata/md5-cache/dev-perl/Log-Log4perl-1.490.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Path-2.60.600 >=virtual/perl-File-Spec-0.820.0 virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/Log-Log4perl-1.49.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b746f853055a7bc922b456ea46939398
+_md5_=5ebd0eed3b6a3706bc8f6a3f4831acf3
diff --git a/metadata/md5-cache/dev-perl/Log-Message-0.80.0 b/metadata/md5-cache/dev-perl/Log-Message-0.80.0
index 4a7fddbbeefe..708655d92f7b 100644
--- a/metadata/md5-cache/dev-perl/Log-Message-0.80.0
+++ b/metadata/md5-cache/dev-perl/Log-Message-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Locale-Maketext-Simple virtual/perl-Module-Load virtual/perl-Params-Check virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b277aad9885079252da376aaf56e4518
+_md5_=48ccabda538c125f2d21bd831ac79af7
diff --git a/metadata/md5-cache/dev-perl/Log-Message-Simple-0.100.0 b/metadata/md5-cache/dev-perl/Log-Message-Simple-0.100.0
index ab10cf92c947..baeb47341d96 100644
--- a/metadata/md5-cache/dev-perl/Log-Message-Simple-0.100.0
+++ b/metadata/md5-cache/dev-perl/Log-Message-Simple-0.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Log-Message virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-Simple-0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9855bfd16291f4da7a538c81997ff7dc
+_md5_=e478ec2bf777f95864946bc07d70e97e
diff --git a/metadata/md5-cache/dev-perl/Log-Report-1.260.0 b/metadata/md5-cache/dev-perl/Log-Report-1.260.0
index 91d1944965c6..b600ceb16503 100644
--- a/metadata/md5-cache/dev-perl/Log-Report-1.260.0
+++ b/metadata/md5-cache/dev-perl/Log-Report-1.260.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Devel-GlobalDestruction-0.90.0 >=virtual/perl-Encode-2.0.0 >=dev-perl/Log-Report-Optional-1.30.0 virtual/perl-Scalar-List-Utils >=dev-perl/String-Print-0.910.0 >=virtual/perl-Sys-Syslog-0.270.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Log-Report-1.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3d95e6a8b7d2ba8ba203dc1484857b6a
+_md5_=dbcd5bd86d0a0e8ca3595c257c995154
diff --git a/metadata/md5-cache/dev-perl/Log-Report-Optional-1.30.0 b/metadata/md5-cache/dev-perl/Log-Report-Optional-1.30.0
index 1a42a979b976..f53ab6b0a09c 100644
--- a/metadata/md5-cache/dev-perl/Log-Report-Optional-1.30.0
+++ b/metadata/md5-cache/dev-perl/Log-Report-Optional-1.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/String-Print-0.910.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Log-Report-Optional-1.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d674140a6db518c12b084fc0ce32dacf
+_md5_=3837507524365fb9fe5b0aae55f61e21
diff --git a/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1 b/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
index 5481aed7574c..89d361f2699f 100644
--- a/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
+++ b/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl[gdbm] dev-perl/XML-SAX dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GM/GMCHARLT/MARC-Charset-1.35.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=248108983f65faed5ba9f6cdf86cc90c
+_md5_=d6eae545c44178d27075dca860f5bba0
diff --git a/metadata/md5-cache/dev-perl/MARC-File-XML-1.0.5 b/metadata/md5-cache/dev-perl/MARC-File-XML-1.0.5
index a70300430ed4..bd2be004bd3e 100644
--- a/metadata/md5-cache/dev-perl/MARC-File-XML-1.0.5
+++ b/metadata/md5-cache/dev-perl/MARC-File-XML-1.0.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/MARC-Charset-0.980.0 >=dev-perl/MARC-Record-2.0.0 >=dev-perl/XML-LibXML-1.660.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GM/GMCHARLT/MARC-File-XML-1.0.5.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ea064dcc7df45b6121f1942b20c9941b
+_md5_=4889b80f4208e415d8ce5a8c67e28588
diff --git a/metadata/md5-cache/dev-perl/MARC-Record-2.0.7 b/metadata/md5-cache/dev-perl/MARC-Record-2.0.7
index 67b04755a9a3..f9d161336f2f 100644
--- a/metadata/md5-cache/dev-perl/MARC-Record-2.0.7
+++ b/metadata/md5-cache/dev-perl/MARC-Record-2.0.7
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GM/GMCHARLT/MARC-Record-2.0.7.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ddd620cdb490ff55e356947995a6beb8
+_md5_=3b5952690cae7700b6fe506bf235b901
diff --git a/metadata/md5-cache/dev-perl/MCE-1.831.0 b/metadata/md5-cache/dev-perl/MCE-1.831.0
index 1827ffbd7f55..b849931d1b2e 100644
--- a/metadata/md5-cache/dev-perl/MCE-1.831.0
+++ b/metadata/md5-cache/dev-perl/MCE-1.831.0
@@ -7,7 +7,8 @@ IUSE=test +sereal
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-IO virtual/perl-Scalar-List-Utils virtual/perl-Socket >=virtual/perl-Storable-2.40.0 virtual/perl-Time-HiRes sereal? ( >=dev-perl/Sereal-Encoder-3.15.0 >=dev-perl/Sereal-Decoder-3.15.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.831.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4ddf06ded64999bf8f1871e863cdc7a1
+_md5_=27fa702cdb60b5cdfa88f2f8b7fddfad
diff --git a/metadata/md5-cache/dev-perl/MIME-Base32-1.303.0 b/metadata/md5-cache/dev-perl/MIME-Base32-1.303.0
index bb5bff20c5f7..33af05d6e18f 100644
--- a/metadata/md5-cache/dev-perl/MIME-Base32-1.303.0
+++ b/metadata/md5-cache/dev-perl/MIME-Base32-1.303.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/MIME-Base32-1.303.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4f0ee37e7a7fcd7731fa94537ab1cbf1
+_md5_=b37c79362113e247fdc6bcf3a1c16899
diff --git a/metadata/md5-cache/dev-perl/MIME-EncWords-1.14.3 b/metadata/md5-cache/dev-perl/MIME-EncWords-1.14.3
index 0cf6a08399de..0fea0a2ae500 100644
--- a/metadata/md5-cache/dev-perl/MIME-EncWords-1.14.3
+++ b/metadata/md5-cache/dev-perl/MIME-EncWords-1.14.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2.130.0 >=virtual/perl-Encode-1.980.0 >=dev-perl/MIME-Charset-1.10.1 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEZUMI/MIME-EncWords-1.014.3.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8fea4e499b7e46c4a72d93b7b4bc950a
+_md5_=fbb7446c0768ab7dc18108546a7f4d85
diff --git a/metadata/md5-cache/dev-perl/MIME-Lite-HTML-1.240.0 b/metadata/md5-cache/dev-perl/MIME-Lite-HTML-1.240.0
index b35365fd1f5c..ddb513f9e4a8 100644
--- a/metadata/md5-cache/dev-perl/MIME-Lite-HTML-1.240.0
+++ b/metadata/md5-cache/dev-perl/MIME-Lite-HTML-1.240.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/MIME-Lite dev-perl/URI dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALIAN/MIME-Lite-HTML-1.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8af75ac0fd1c25d7c5b38e8925c8b419
+_md5_=ea6e60b39c6a316dfa99c12961d25839
diff --git a/metadata/md5-cache/dev-perl/MIME-Types-2.120.0 b/metadata/md5-cache/dev-perl/MIME-Types-2.120.0
index 0050ea7453f0..30bee1f09e9a 100644
--- a/metadata/md5-cache/dev-perl/MIME-Types-2.120.0
+++ b/metadata/md5-cache/dev-perl/MIME-Types-2.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a6019655a4dfa8724cbfa71dc1d281b8
+_md5_=e8188f27f73d4d24abce6015f1b3251d
diff --git a/metadata/md5-cache/dev-perl/MIME-Types-2.130.0 b/metadata/md5-cache/dev-perl/MIME-Types-2.130.0
index f4b194b4ec94..7f1ff7fa112e 100644
--- a/metadata/md5-cache/dev-perl/MIME-Types-2.130.0
+++ b/metadata/md5-cache/dev-perl/MIME-Types-2.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f043696862c50985aacd9c66f70600c1
+_md5_=49967aeff6fe39aeec374786a7758c4d
diff --git a/metadata/md5-cache/dev-perl/MIME-tools-5.509.0 b/metadata/md5-cache/dev-perl/MIME-tools-5.509.0
index 6576c1eb4235..8f1f32638b64 100644
--- a/metadata/md5-cache/dev-perl/MIME-tools-5.509.0
+++ b/metadata/md5-cache/dev-perl/MIME-tools-5.509.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Path-1 >=virtual/perl-File-Spec-0.600.0 >=virtual/perl-File-Temp-0.180.0 virtual/perl-IO >=virtual/perl-MIME-Base64-2.200.0 dev-perl/MailTools dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=85a9c62ecc900f4084eca46efe72549b
+_md5_=7bad6528e3fca79cc19b40fcb037d2f0
diff --git a/metadata/md5-cache/dev-perl/MLDBM-2.50.0 b/metadata/md5-cache/dev-perl/MLDBM-2.50.0
index 4b0389234279..9ef0edc5f517 100644
--- a/metadata/md5-cache/dev-perl/MLDBM-2.50.0
+++ b/metadata/md5-cache/dev-perl/MLDBM-2.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm arm64 ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Data-Dumper-2.80.0 virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/MLDBM-2.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d62d9b030fc0818f8cb5a7e771fd07a6
+_md5_=afb0a596cf44a1deda5f2ecb1a22a528
diff --git a/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1 b/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
index 48aa0fd82bce..830aa8c3ec49 100644
--- a/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~ppc ~ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MLDBM dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHAMAS/MLDBM-Sync-0.30.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=72d42a697f4c6b5375cf611e9fe237d5
+_md5_=6a4bfe757bd88aac07f8ec4181939639
diff --git a/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0 b/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0
index 0e0ca7e34107..895e60d01b19 100644
--- a/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0
+++ b/metadata/md5-cache/dev-perl/MRO-Compat-0.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=861848137e8cba9324a463d5d14c5d52
+_md5_=ec89d3ce39b4d1c5ee5d3033be4b6fed
diff --git a/metadata/md5-cache/dev-perl/Mail-Audit-2.228.0-r1 b/metadata/md5-cache/dev-perl/Mail-Audit-2.228.0-r1
index e88892a66914..3ee873b90560 100644
--- a/metadata/md5-cache/dev-perl/Mail-Audit-2.228.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-Audit-2.228.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/File-HomeDir-0.610.0 virtual/perl-File-Path virtual/perl-File-Spec dev-perl/File-Tempdir dev-perl/MIME-tools >=dev-perl/MailTools-1.15 dev-perl/Mail-POP3Client dev-perl/Parse-RecDescent virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Mail-Audit-2.228.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f41c4508b4cfa4604864db9a605103f4
+_md5_=335b35bb27a2e4198ce9d36f33896b66
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-3.3.0 b/metadata/md5-cache/dev-perl/Mail-Box-3.3.0
index 884999a16c39..08bd054e694a 100644
--- a/metadata/md5-cache/dev-perl/Mail-Box-3.3.0
+++ b/metadata/md5-cache/dev-perl/Mail-Box-3.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=dev-perl/Mail-Box-IMAP4 dev-perl/Mail-Box-POP3
 RDEPEND=virtual/perl-Carp dev-perl/TimeDate >=dev-perl/Devel-GlobalDestruction-0.90.0 >=dev-perl/File-Remove-0.200.0 >=virtual/perl-File-Spec-0.700.0 dev-perl/IO-stringy >=dev-perl/Mail-Message-3 >=dev-perl/Mail-Transport-3 >=dev-perl/Object-Realize-Later-0.190.0 >=virtual/perl-Scalar-List-Utils-1.130.0 >=virtual/perl-Test-Simple-0.470.0 !!<dev-perl/Mail-Box-3 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8e583d4e6d65dc61f6dcf37a14b1c63b
+_md5_=4d3f5adcc168c8c28b4132c640fe1780
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.2.0 b/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.2.0
index 6fcdceac01ba..90127582cdb5 100644
--- a/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.2.0
+++ b/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.2.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate dev-perl/Digest-HMAC virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Mail-Box-3 dev-perl/Mail-IMAPClient >=dev-perl/Mail-Message-3 >=dev-perl/Mail-Transport-3 virtual/perl-Scalar-List-Utils !!<dev-perl/Mail-Box-3 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-IMAP4-3.002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c14ff29e4f82fe34911c7e008eca51a8
+_md5_=9ee8505cf31a1b2a12c852988e10e62d
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.3.0 b/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.3.0
index c8249a95f414..5182e874d683 100644
--- a/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.3.0
+++ b/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.3.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Mail-Message-3 >=dev-perl/Mail-Box-3 virtual/perl-Scalar-List-Utils virtual/perl-Socket !!<dev-perl/Mail-Box-3 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-POP3-3.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a513e3d793c0a461397ca13061416794
+_md5_=a2983eab1940989bca08c928d89f7b27
diff --git a/metadata/md5-cache/dev-perl/Mail-Builder-2.130.0 b/metadata/md5-cache/dev-perl/Mail-Builder-2.130.0
index 42c4c6d9cded..ab447ae66b3b 100644
--- a/metadata/md5-cache/dev-perl/Mail-Builder-2.130.0
+++ b/metadata/md5-cache/dev-perl/Mail-Builder-2.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Load dev-perl/Email-Address dev-perl/Email-Date-Format >=dev-perl/Email-MessageID-1.400.0 dev-perl/Email-Valid virtual/perl-Encode >=dev-perl/MIME-tools-5.400.0 >=dev-perl/HTML-Tree-3.0.0 dev-perl/MIME-Types >=dev-perl/Moose-0.940.0 dev-perl/Path-Class dev-perl/Text-Table dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAROS/Mail-Builder-2.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4f4381ad513c6efe95f8f756556103a3
+_md5_=c8f9b5cd469f75a08c2c943068f7aff0
diff --git a/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1 b/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
index a12c360934be..d44d15deea64 100644
--- a/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Mail-Builder-1.12 dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Config-Any dev-perl/Config-General dev-perl/Exception-Died >=dev-perl/MailTools-2.04 dev-perl/Email-MessageID dev-perl/MIME-tools dev-perl/HTML-Template dev-perl/Template-Toolkit dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TE/TEDDY/Mail-Builder-Simple-0.16.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=22f2d7779af0c0b3f2ced7c0b9aaf90b
+_md5_=71e47387713bccc733721068225c5da8
diff --git a/metadata/md5-cache/dev-perl/Mail-DKIM-0.410.0 b/metadata/md5-cache/dev-perl/Mail-DKIM-0.410.0
index e1d876d48974..4096c8927eda 100644
--- a/metadata/md5-cache/dev-perl/Mail-DKIM-0.410.0
+++ b/metadata/md5-cache/dev-perl/Mail-DKIM-0.410.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Crypt-OpenSSL-RSA-0.24 virtual/perl-Digest-SHA virtual/perl-MIME-Base64 dev-perl/Net-DNS dev-perl/MailTools dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.41.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4cb795673652ad33395676e86081352f
+_md5_=158cfb91b9896b880a4a987108ab1a69
diff --git a/metadata/md5-cache/dev-perl/Mail-DKIM-0.440.0 b/metadata/md5-cache/dev-perl/Mail-DKIM-0.440.0
index 36047a1a215c..fdd4a5412068 100644
--- a/metadata/md5-cache/dev-perl/Mail-DKIM-0.440.0
+++ b/metadata/md5-cache/dev-perl/Mail-DKIM-0.440.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Crypt-OpenSSL-RSA-0.24 virtual/perl-Digest-SHA virtual/perl-MIME-Base64 dev-perl/Net-DNS dev-perl/MailTools dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.44.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bf53980a87caf6a43ae66b17931fcf76
+_md5_=2e4f09def78d1bcfa62c6fb2776fc883
diff --git a/metadata/md5-cache/dev-perl/Mail-DMARC-1.201.709.110 b/metadata/md5-cache/dev-perl/Mail-DMARC-1.201.709.110
index 4ef3514b1d5d..f99fb564277e 100644
--- a/metadata/md5-cache/dev-perl/Mail-DMARC-1.201.709.110
+++ b/metadata/md5-cache/dev-perl/Mail-DMARC-1.201.709.110
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Net-IMAP-Simple ) dev-perl/CGI virtual/perl-CPAN virtual/perl-Carp dev-perl/Config-Tiny >=dev-perl/DBD-SQLite-1.310.0 >=dev-perl/DBIx-Simple-1.350.0 virtual/perl-Data-Dumper dev-perl/Email-MIME dev-perl/Email-Simple virtual/perl-Encode dev-perl/File-ShareDir virtual/perl-Getopt-Long dev-perl/HTTP-Message virtual/perl-HTTP-Tiny virtual/perl-IO virtual/perl-IO-Compress dev-perl/IO-Socket-SSL dev-perl/JSON dev-perl/libwww-perl dev-perl/Mail-DKIM dev-perl/Net-DNS dev-perl/Net-HTTP dev-perl/Net-IDN-Encode dev-perl/Net-IP dev-perl/Net-SMTPS dev-perl/Net-SSLeay >=dev-perl/Net-Server-2 virtual/perl-Socket >=dev-perl/Socket6-0.230.0 virtual/perl-Sys-Syslog dev-perl/Test-File-ShareDir dev-perl/URI dev-perl/XML-LibXML virtual/perl-parent >=dev-perl/Regexp-Common-2013031301 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DMARC-1.20170911.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=57f35ad1b6e7821951a90bc3767f4c8b
+_md5_=62af543f7f5cf65b2c09763b0eddff45
diff --git a/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1 b/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
index 27c19f25de29..8b88f22dc6ea 100644
--- a/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-DNS-0.34 dev-perl/MailTools dev-perl/Crypt-OpenSSL-RSA dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANTHONYU/Mail-DomainKeys-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=810b721f4fc8bad3af8c9c1cf9d4481d
+_md5_=94bd1ce724c0268444a65a75fe47b922
diff --git a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.390.0 b/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.390.0
index cdb9f489e232..ce21a58887af 100644
--- a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.390.0
+++ b/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.390.0
@@ -7,7 +7,8 @@ IUSE=test ntlm md5 ssl zlib examples
 KEYWORDS=alpha amd64 arm ia64 ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Temp >=virtual/perl-IO-1.260.0 virtual/perl-Scalar-List-Utils virtual/perl-MIME-Base64 >=dev-perl/Parse-RecDescent-1.967.9 ntlm? ( dev-perl/Authen-NTLM ) md5? ( dev-perl/Authen-SASL dev-perl/Digest-HMAC virtual/perl-Digest-MD5 ) ssl? ( dev-perl/IO-Socket-SSL ) zlib? ( virtual/perl-IO-Compress ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.39.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5cc81e1fa8f953eb897e040df4bccb98
+_md5_=8708cf51403aa6e6eb21062d6a0abb0b
diff --git a/metadata/md5-cache/dev-perl/Mail-Mbox-MessageParser-1.510.500 b/metadata/md5-cache/dev-perl/Mail-Mbox-MessageParser-1.510.500
index bd956c2987f9..0e92b0089b52 100644
--- a/metadata/md5-cache/dev-perl/Mail-Mbox-MessageParser-1.510.500
+++ b/metadata/md5-cache/dev-perl/Mail-Mbox-MessageParser-1.510.500
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/FileHandle-Unget virtual/perl-Storable dev-perl/File-Slurp dev-perl/URI dev-perl/Text-Diff dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/Mail-Mbox-MessageParser-1.5105.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=211f0fbf00adb8c82f9225189ce77edd
+_md5_=d07f440f7999dbc630919d88abf6bef3
diff --git a/metadata/md5-cache/dev-perl/Mail-Message-3.2.0 b/metadata/md5-cache/dev-perl/Mail-Message-3.2.0
index 24d501425b4d..db03789a6276 100644
--- a/metadata/md5-cache/dev-perl/Mail-Message-3.2.0
+++ b/metadata/md5-cache/dev-perl/Mail-Message-3.2.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate >=virtual/perl-Encode-2.260.0 >=virtual/perl-File-Spec-0.700.0 dev-perl/IO-stringy virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.4.0 >=dev-perl/MailTools-2.170.0 >=virtual/perl-Scalar-List-Utils-1.130.0 >=dev-perl/URI-1.230.0 >=dev-perl/User-Identity-0.940.0 !!<dev-perl/Mail-Box-3 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ae2a8ec1b55f2cc3f945dffeab7cb99c
+_md5_=450710e02a903052a758f62db1db148f
diff --git a/metadata/md5-cache/dev-perl/Mail-SPF-2.9.0-r2 b/metadata/md5-cache/dev-perl/Mail-SPF-2.9.0-r2
index c0e7751fb5c7..0501468cb408 100644
--- a/metadata/md5-cache/dev-perl/Mail-SPF-2.9.0-r2
+++ b/metadata/md5-cache/dev-perl/Mail-SPF-2.9.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=dev-perl/Error >=dev-perl/Net-DNS-0.620.0 >=dev-perl/NetAddr-IP-4 >=dev-perl/URI-1.130.0 >=dev-perl/Net-DNS-Resolver-Programmable-0.3.0 virtual/perl-version !!dev-perl/Mail-SPF-Query dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-v2.9.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=506ff7749dc4c492b008436b60159a2b
+_md5_=236cf8806e3667755764b017c6fbd1c6
diff --git a/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2 b/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
index e4df3a52a84e..888a5975d889 100644
--- a/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
+++ b/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Digest-HMAC-1.01-r1 >=dev-perl/MLDBM-2.01 >=virtual/perl-DB_File-1.807 >=virtual/perl-Digest-MD5-2.33 >=virtual/perl-Storable-2.04-r1 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHEVEK/Mail-SRS-0.31.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ce81fe3f1b744af9077c3dd0e541a0a
+_md5_=87396aa8dda72cb3ddf73512a6f1b24d
diff --git a/metadata/md5-cache/dev-perl/Mail-Sender-0.903.0 b/metadata/md5-cache/dev-perl/Mail-Sender-0.903.0
index 40d050c328a8..43e2f1874e22 100644
--- a/metadata/md5-cache/dev-perl/Mail-Sender-0.903.0
+++ b/metadata/md5-cache/dev-perl/Mail-Sender-0.903.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Authen-NTLM dev-perl/Digest-HMAC dev-perl/IO-Socket-SSL dev-perl/Mozilla-CA dev-perl/Net-SSLeay ) virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter virtual/perl-IO virtual/perl-MIME-Base64 virtual/perl-Socket virtual/perl-Time-Local dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPOEIRAB/Mail-Sender-0.903.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c8206a033be000c3956ed78b313e9369
+_md5_=08887cb5464b3c5d4c5de190cd3ab79d
diff --git a/metadata/md5-cache/dev-perl/Mail-Transport-3.0.0 b/metadata/md5-cache/dev-perl/Mail-Transport-3.0.0
index 167a1fa96a53..7ecd7fd9ee4d 100644
--- a/metadata/md5-cache/dev-perl/Mail-Transport-3.0.0
+++ b/metadata/md5-cache/dev-perl/Mail-Transport-3.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-File-Spec-0.700.0 virtual/perl-IO >=dev-perl/Mail-Message-3 virtual/perl-Scalar-List-Utils virtual/perl-libnet !!<dev-perl/Mail-Box-3 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.000.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d7deff261a42cc565c5f35dc1ed7da04
+_md5_=9fa2f3a4232691bf70b31782e99afe50
diff --git a/metadata/md5-cache/dev-perl/MailTools-2.190.0 b/metadata/md5-cache/dev-perl/MailTools-2.190.0
index 30c1276606ec..9c043c3908fe 100644
--- a/metadata/md5-cache/dev-perl/MailTools-2.190.0
+++ b/metadata/md5-cache/dev-perl/MailTools-2.190.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate virtual/perl-IO >=virtual/perl-libnet-1.50.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ded0220ce046ee458a493dbb55d93e7a
+_md5_=07cd617d9d2b91c0c5dd92da83d42dc1
diff --git a/metadata/md5-cache/dev-perl/Math-Base36-0.140.0 b/metadata/md5-cache/dev-perl/Math-Base36-0.140.0
index 2c6300b61e07..4d88a35d7bed 100644
--- a/metadata/md5-cache/dev-perl/Math-Base36-0.140.0
+++ b/metadata/md5-cache/dev-perl/Math-Base36-0.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/Math-Base36-0.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e8a8c3b13a240e8fc287b4336f639268
+_md5_=68098a1cd9b9fa55fc7dcda5512e865a
diff --git a/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.600.200 b/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.600.200
index 08e7e84a66c9..26df5a50d979 100644
--- a/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.600.200
+++ b/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.600.200
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ppc sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.999.801 >=virtual/perl-XSLoader-0.20.0 >=dev-libs/gmp-4.0.0:0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c481badbd3bab852d204543eec36845c
+_md5_=b8e51f043530c79c03735bd04eb3158d
diff --git a/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.600.600 b/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.600.600
index 334c49473611..b7dbfa6350ba 100644
--- a/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.600.600
+++ b/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.600.600
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ppc sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.999.812 >=virtual/perl-XSLoader-0.20.0 >=dev-libs/gmp-4.0.0:0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=323f685bcab9574444b3cbfe954e8251
+_md5_=e92f33f38c2fdc8aaf78ea4a4fde1848
diff --git a/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.140.0 b/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.140.0
index d529529e0908..a3874db7453a 100644
--- a/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.140.0
+++ b/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.940.0 >=virtual/perl-Math-BigRat-0.190.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/Math-BigInt-Lite-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=64d91e9a648b493635d31293c268b25c
+_md5_=b0a38eb7018441eab735d9041f1dd71c
diff --git a/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.170.0 b/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.170.0
index 8a5cc71eed1d..6caa8bbc3cc3 100644
--- a/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.170.0
+++ b/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.170.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.999.801 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c5c90f5bc9446851cae6452c083e589d
+_md5_=a1fd214952d28e4e27ff5298ed250015
diff --git a/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.180.0 b/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.180.0
index 17a13349a7f9..8e1c6575aac8 100644
--- a/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.180.0
+++ b/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.180.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.999.812 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=21967dab23cff430da51ea0804b7a322
+_md5_=f384f99398b8a122177af4c5cadf5ceb
diff --git a/metadata/md5-cache/dev-perl/Math-CDF-0.100.0 b/metadata/md5-cache/dev-perl/Math-CDF-0.100.0
index 01c5846ed356..074abe661f49 100644
--- a/metadata/md5-cache/dev-perl/Math-CDF-0.100.0
+++ b/metadata/md5-cache/dev-perl/Math-CDF-0.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CALLAHAN/Math-CDF-0.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3f0fed3f44404ff0c2af38a86966f139
+_md5_=0eb1b67c2ea060e3d63652be6d1b9346
diff --git a/metadata/md5-cache/dev-perl/Math-Derivative-1.10.0 b/metadata/md5-cache/dev-perl/Math-Derivative-1.10.0
index 7f871072cb4e..208239467e39 100644
--- a/metadata/md5-cache/dev-perl/Math-Derivative-1.10.0
+++ b/metadata/md5-cache/dev-perl/Math-Derivative-1.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JG/JGAMBLE/Math-Derivative-1.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e31da6c54d393631eabd237d86960b80
+_md5_=db8c9f88bf01a939e0f124fa3b846e1a
diff --git a/metadata/md5-cache/dev-perl/Math-FFT-1.340.0 b/metadata/md5-cache/dev-perl/Math-FFT-1.340.0
index 06dace908bff..f24d34e679cb 100644
--- a/metadata/md5-cache/dev-perl/Math-FFT-1.340.0
+++ b/metadata/md5-cache/dev-perl/Math-FFT-1.340.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Math-FFT-1.34.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2bf5551751efa12ff75e2c5cd320de75
+_md5_=91c5b23bb5930463670630c46221b6a1
diff --git a/metadata/md5-cache/dev-perl/Math-Factor-XS-0.400.0 b/metadata/md5-cache/dev-perl/Math-Factor-XS-0.400.0
index f6c78b7aef26..6bd6e02adffb 100644
--- a/metadata/md5-cache/dev-perl/Math-Factor-XS-0.400.0
+++ b/metadata/md5-cache/dev-perl/Math-Factor-XS-0.400.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/boolean dev-perl/List-MoreUtils dev-perl/Params-Validate virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/Math-Factor-XS-0.40.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=943c1b0ac2401c1c1043ab0ade721b47
+_md5_=5926144034ac97737e1a430619d63b5f
diff --git a/metadata/md5-cache/dev-perl/Math-GMP-2.150.0 b/metadata/md5-cache/dev-perl/Math-GMP-2.150.0
index 7e50157b7797..dcfae37146a9 100644
--- a/metadata/md5-cache/dev-perl/Math-GMP-2.150.0
+++ b/metadata/md5-cache/dev-perl/Math-GMP-2.150.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ~mips ppc x86
 LICENSE=LGPL-2
 RDEPEND=virtual/perl-AutoLoader virtual/perl-Carp virtual/perl-Exporter dev-libs/gmp:0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=075dcd33f73d52eed6bf863266f2a7e7
+_md5_=efafb65022c4ec57add0f99e75fdfda0
diff --git a/metadata/md5-cache/dev-perl/Math-Libm-1.0.0 b/metadata/md5-cache/dev-perl/Math-Libm-1.0.0
index f181897ef34d..762dfd28b57f 100644
--- a/metadata/md5-cache/dev-perl/Math-Libm-1.0.0
+++ b/metadata/md5-cache/dev-perl/Math-Libm-1.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-AutoLoader virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSLEWART/Math-Libm-1.00.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cf4be8a8726cc085586d3aec3c0c1f3c
+_md5_=012bd67874be21b4371f87107b70f3d6
diff --git a/metadata/md5-cache/dev-perl/Math-ModInt-0.11.0 b/metadata/md5-cache/dev-perl/Math-ModInt-0.11.0
index b2644adfebeb..e9d2198c1475 100644
--- a/metadata/md5-cache/dev-perl/Math-ModInt-0.11.0
+++ b/metadata/md5-cache/dev-perl/Math-ModInt-0.11.0
@@ -7,7 +7,8 @@ IUSE=minimal test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Math-BigInt-1.991.0 !minimal? ( dev-perl/Math-BigInt-GMP virtual/perl-Math-BigRat ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MH/MHASCH/Math-ModInt-0.011.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6496e3d1a9d6e06b57570dff783633b5
+_md5_=c048a9db7bcbd210c084f567a354c7ac
diff --git a/metadata/md5-cache/dev-perl/Math-NumSeq-72.0.0 b/metadata/md5-cache/dev-perl/Math-NumSeq-72.0.0
index a01f1836276e..575ac308e7d7 100644
--- a/metadata/md5-cache/dev-perl/Math-NumSeq-72.0.0
+++ b/metadata/md5-cache/dev-perl/Math-NumSeq-72.0.0
@@ -7,7 +7,8 @@ IUSE=test examples examples
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Scalar-List-Utils >=dev-perl/Math-Factor-XS-0.400.0 dev-perl/Math-Libm >=dev-perl/Math-Prime-XS-0.260.0 virtual/perl-Module-Load >=dev-perl/Module-Pluggable-4.700.0 dev-perl/Module-Util >=dev-perl/constant-defer-1.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/Math-NumSeq-72.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=80ea71736a17bec099e89d3a110b2eac
+_md5_=62c4743f687fae1955f8c261c2e711ab
diff --git a/metadata/md5-cache/dev-perl/Math-PlanePath-123.0.0 b/metadata/md5-cache/dev-perl/Math-PlanePath-123.0.0
index ac8cff76b234..3dac1094489e 100644
--- a/metadata/md5-cache/dev-perl/Math-PlanePath-123.0.0
+++ b/metadata/md5-cache/dev-perl/Math-PlanePath-123.0.0
@@ -7,7 +7,8 @@ IUSE=gmp test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=gmp? ( dev-perl/Math-BigInt-GMP ) dev-perl/Math-Libm dev-perl/Math-NumSeq >=dev-perl/constant-defer-5.0.0 virtual/perl-Scalar-List-Utils virtual/perl-Math-BigInt dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-123.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=20914ecc3fe13c30ce99af4df5e471c9
+_md5_=f4ffb83abb1417d8e821b3233e51d177
diff --git a/metadata/md5-cache/dev-perl/Math-PlanePath-124.0.0 b/metadata/md5-cache/dev-perl/Math-PlanePath-124.0.0
index 1c525dff3d0b..a4867b05639f 100644
--- a/metadata/md5-cache/dev-perl/Math-PlanePath-124.0.0
+++ b/metadata/md5-cache/dev-perl/Math-PlanePath-124.0.0
@@ -7,7 +7,8 @@ IUSE=gmp test examples
 KEYWORDS=~amd64 x86
 LICENSE=GPL-3+
 RDEPEND=gmp? ( dev-perl/Math-BigInt-GMP ) dev-perl/Math-Libm dev-perl/Math-NumSeq >=dev-perl/constant-defer-5.0.0 virtual/perl-Scalar-List-Utils virtual/perl-Math-BigInt dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-124.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5fc07cb2e31312907f48c4c105d443d2
+_md5_=94c461376f0532418ed708b27061df6b
diff --git a/metadata/md5-cache/dev-perl/Math-Prime-XS-0.270.0 b/metadata/md5-cache/dev-perl/Math-Prime-XS-0.270.0
index 3dbde608fdb0..69e8a01cb6c1 100644
--- a/metadata/md5-cache/dev-perl/Math-Prime-XS-0.270.0
+++ b/metadata/md5-cache/dev-perl/Math-Prime-XS-0.270.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/boolean dev-perl/Params-Validate virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/Math-Prime-XS-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7b3d7c84a53dbe199968685d400ad5a8
+_md5_=81c995dd53eeb62a69aae82d9730fe15
diff --git a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1 b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
index 8fe17767fadd..82ca9f40ccad 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=|| ( public-domain MIT Artistic Artistic-2 GPL-1 GPL-2 GPL-3 )
 PDEPEND=dev-perl/Math-Random-ISAAC-XS
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-1.004.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c921ac5ac9f34a24c0442f8bf6e289bc
+_md5_=05e236a7182c393b351aeef2100a992a
diff --git a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1 b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
index 638d6deff2d6..a651dc9d43a9 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( public-domain Artistic Artistic-2 GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Math-Random-ISAAC dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-XS-1.004.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=062787a2f06c3ae538cdeb950b53cd09
+_md5_=00bda596c8e0d5fad68a05827de94d30
diff --git a/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0 b/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
index 0c15320ab0b0..91e05d404948 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
+++ b/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FA/FANGLY/Math-Random-MT-1.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7fb7cd9cf882a29e90a4ae6e92bc2970
+_md5_=1ec55c3e8af939d124a8c451e88a5cb1
diff --git a/metadata/md5-cache/dev-perl/Math-Random-Secure-0.80.1 b/metadata/md5-cache/dev-perl/Math-Random-Secure-0.80.1
index 9d9b0f706ab4..055fa1ca43e6 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-Secure-0.80.1
+++ b/metadata/md5-cache/dev-perl/Math-Random-Secure-0.80.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Moo-2.0.0 >=dev-perl/Crypt-Random-Source-0.70 >=dev-perl/Math-Random-ISAAC-1.1.0 dev-perl/Math-Random-ISAAC-XS dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FREW/Math-Random-Secure-0.080001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=aea42a1ef07a019fe47d902848dacd39
+_md5_=e93eee230f515a516191723857caf0a2
diff --git a/metadata/md5-cache/dev-perl/Math-Spline-0.20.0 b/metadata/md5-cache/dev-perl/Math-Spline-0.20.0
index 14f6a77f225f..2a0addbdca5d 100644
--- a/metadata/md5-cache/dev-perl/Math-Spline-0.20.0
+++ b/metadata/md5-cache/dev-perl/Math-Spline-0.20.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Math-Derivative virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Math-Spline-0.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=40b26e081e063850e94cac4ef29a6532
+_md5_=8f8fed1459f70882dc8119fe2f619125
diff --git a/metadata/md5-cache/dev-perl/Math-Utils-1.110.0 b/metadata/md5-cache/dev-perl/Math-Utils-1.110.0
index 44655b28f500..a963e327af6d 100644
--- a/metadata/md5-cache/dev-perl/Math-Utils-1.110.0
+++ b/metadata/md5-cache/dev-perl/Math-Utils-1.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JG/JGAMBLE/Math-Utils-1.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0069c383aacf3d09bccd3bae232ae8c9
+_md5_=792c59bdcbfa6565d37341bcc76a9a46
diff --git a/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1 b/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
index 074ac69f1d04..70da3073e0da 100644
--- a/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EW/EWILHELM/Math-Vec-1.01.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f9e4f6991049c1a1070630aa61fede47
+_md5_=5b5abbb183d9f035a3c50a1c71f600d5
diff --git a/metadata/md5-cache/dev-perl/MediaWiki-API-0.410.0 b/metadata/md5-cache/dev-perl/MediaWiki-API-0.410.0
index 57c8a204b640..9e99e5b930f6 100644
--- a/metadata/md5-cache/dev-perl/MediaWiki-API-0.410.0
+++ b/metadata/md5-cache/dev-perl/MediaWiki-API-0.410.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-perl/JSON dev-perl/libwww-perl virtual/perl-Carp virtual/perl-Encode dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXOBUZZ/MediaWiki-API-0.41.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0708a696d5713a1f5c5b6f4239a54781
+_md5_=4d0fa942123ad815d7003323db1c73e3
diff --git a/metadata/md5-cache/dev-perl/Mixin-Linewise-0.108.0 b/metadata/md5-cache/dev-perl/Mixin-Linewise-0.108.0
index ad67c4f8ef83..e1f89aa4f39e 100644
--- a/metadata/md5-cache/dev-perl/Mixin-Linewise-0.108.0
+++ b/metadata/md5-cache/dev-perl/Mixin-Linewise-0.108.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-IO dev-perl/PerlIO-utf8_strict dev-perl/Sub-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.108.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=45c1c27adbe95ff741f74776b3bad399
+_md5_=a4a9bd4ff00b2201f260415e026b3a42
diff --git a/metadata/md5-cache/dev-perl/Mo-0.400.0 b/metadata/md5-cache/dev-perl/Mo-0.400.0
index c470baff6d14..54a230f968d2 100644
--- a/metadata/md5-cache/dev-perl/Mo-0.400.0
+++ b/metadata/md5-cache/dev-perl/Mo-0.400.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e11c557cf8ea96ac457d0970308a81cf
+_md5_=b8e6d91c37bc538cc2d3e534a9740c31
diff --git a/metadata/md5-cache/dev-perl/Mock-Config-0.30.0 b/metadata/md5-cache/dev-perl/Mock-Config-0.30.0
index edad4269efc2..c5c46eed90ad 100644
--- a/metadata/md5-cache/dev-perl/Mock-Config-0.30.0
+++ b/metadata/md5-cache/dev-perl/Mock-Config-0.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 sparc x86
 LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-0.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e84b6e633cf0c3388e4131d402532ebd
+_md5_=1a8ac7637b5c75ab14c2123fef003edb
diff --git a/metadata/md5-cache/dev-perl/Modern-Perl-1.201.701.170 b/metadata/md5-cache/dev-perl/Modern-Perl-1.201.701.170
index f1e4bd64cc97..e7ff151778db 100644
--- a/metadata/md5-cache/dev-perl/Modern-Perl-1.201.701.170
+++ b/metadata/md5-cache/dev-perl/Modern-Perl-1.201.701.170
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO >=virtual/perl-autodie-2.220.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20170117.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f30fa15a367db40a3f4be0d9975bc95a
+_md5_=351c0e99e6d9cd115d4e00200b51364c
diff --git a/metadata/md5-cache/dev-perl/Modern-Perl-1.201.907.270 b/metadata/md5-cache/dev-perl/Modern-Perl-1.201.907.270
index 51db4ff75690..4b188472b2b1 100644
--- a/metadata/md5-cache/dev-perl/Modern-Perl-1.201.907.270
+++ b/metadata/md5-cache/dev-perl/Modern-Perl-1.201.907.270
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20190727.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7692502da8954323bb65ee9d6441ea8a
+_md5_=d8b291a2f2da447f4c3ceaead8845e89
diff --git a/metadata/md5-cache/dev-perl/Module-Build-0.422.400 b/metadata/md5-cache/dev-perl/Module-Build-0.422.400
index 376515c7d36d..d11a9188ad3b 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-0.422.400
+++ b/metadata/md5-cache/dev-perl/Module-Build-0.422.400
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-2.142.60 virtual/perl-Data-Dumper >=virtual/perl-ExtUtils-CBuilder-0.270.0 virtual/perl-ExtUtils-Install virtual/perl-ExtUtils-Manifest virtual/perl-ExtUtils-MakeMaker >=virtual/perl-ExtUtils-ParseXS-2.210.0 >=virtual/perl-File-Spec-0.820.0 virtual/perl-Getopt-Long >=virtual/perl-Module-Metadata-1.0.2 >=virtual/perl-Perl-OSType-1 >=virtual/perl-Test-Harness-3.290.0 virtual/perl-Text-ParseWords >=virtual/perl-podlators-2.1.0 >=virtual/perl-version-0.870.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4224.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b9d3fd0df40a087a8a27a8316b048679
+_md5_=c09ef6c586ec72eaac9e223196fc23fc
diff --git a/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0 b/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
index 85a79b444ca4..4ba068a7b72f 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
+++ b/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-CPAN-Meta >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtUtils-CBuilder >=dev-perl/ExtUtils-Config-0.3.0 >=dev-perl/ExtUtils-Helpers-0.20.0 virtual/perl-ExtUtils-Install >=dev-perl/ExtUtils-InstallPaths-0.2.0 virtual/perl-ExtUtils-ParseXS virtual/perl-File-Path virtual/perl-File-Spec >=virtual/perl-Getopt-Long-2.360.0 >=virtual/perl-JSON-PP-2.0.0 virtual/perl-podlators virtual/perl-Test-Harness dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f148dfa616bc967172cf090e5b111735
+_md5_=0ea454084517fd39c77db1f601779e76
diff --git a/metadata/md5-cache/dev-perl/Module-Build-WithXSpp-0.140.0 b/metadata/md5-cache/dev-perl/Module-Build-WithXSpp-0.140.0
index 76cf696161df..dd5b4185e300 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-WithXSpp-0.140.0
+++ b/metadata/md5-cache/dev-perl/Module-Build-WithXSpp-0.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/ExtUtils-CppGuess-0.40.0 >=dev-perl/ExtUtils-XSpp-0.110.0 virtual/perl-Digest-MD5 virtual/perl-ExtUtils-CBuilder >=virtual/perl-ExtUtils-ParseXS-2.220.500 >=dev-perl/Module-Build-0.260.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Module-Build-WithXSpp-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a871b8a9f7d31f5955788bdd4f97344d
+_md5_=484360c2cfd4d88da045492ea68b0e11
diff --git a/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0 b/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0
index 20fd5a3452d0..1d4b4e870437 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0
+++ b/metadata/md5-cache/dev-perl/Module-Build-XSUtil-0.180.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Devel-CheckCompiler virtual/perl-Devel-PPPort virtual/perl-Exporter virtual/perl-ExtUtils-CBuilder virtual/perl-File-Path virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HI/HIDEAKIO/Module-Build-XSUtil-0.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7717d838ef2bfb043da2313eba10988a
+_md5_=2d62ebd7844db72f2aee498d6bdf4442
diff --git a/metadata/md5-cache/dev-perl/Module-Find-0.130.0 b/metadata/md5-cache/dev-perl/Module-Find-0.130.0
index 1b41dde8ca97..a3b780d429d7 100644
--- a/metadata/md5-cache/dev-perl/Module-Find-0.130.0
+++ b/metadata/md5-cache/dev-perl/Module-Find-0.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eebb5bdd7dd26a878061075deabcc652
+_md5_=15dd92096b58237e2634e5302de0f13a
diff --git a/metadata/md5-cache/dev-perl/Module-Implementation-0.90.0 b/metadata/md5-cache/dev-perl/Module-Implementation-0.90.0
index 6a3d4c171475..038f48a737fd 100644
--- a/metadata/md5-cache/dev-perl/Module-Implementation-0.90.0
+++ b/metadata/md5-cache/dev-perl/Module-Implementation-0.90.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/Module-Runtime-0.12.0 dev-perl/Try-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Module-Implementation-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3bc49d6334c2b1bc0721c54b74a15607
+_md5_=8b35c7ca687df951ebf958db38c4083f
diff --git a/metadata/md5-cache/dev-perl/Module-Info-0.370.0-r1 b/metadata/md5-cache/dev-perl/Module-Info-0.370.0-r1
index 87c87236bdf2..9bd60463beac 100644
--- a/metadata/md5-cache/dev-perl/Module-Info-0.370.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Info-0.370.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ~mips ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Utils-0.270.0 virtual/perl-Carp >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Module-Info-0.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c8e0478694c77380604d024be332fd09
+_md5_=9c42ec36b6196acf2c53e8e8e35d3fc6
diff --git a/metadata/md5-cache/dev-perl/Module-Install-1.180.0 b/metadata/md5-cache/dev-perl/Module-Install-1.180.0
index a2570ff73128..5f7931339b04 100644
--- a/metadata/md5-cache/dev-perl/Module-Install-1.180.0
+++ b/metadata/md5-cache/dev-perl/Module-Install-1.180.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-1.441.300 >=virtual/perl-Devel-PPPort-3.160.0 >=virtual/perl-ExtUtils-Install-1.520.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 >=virtual/perl-ExtUtils-ParseXS-2.190.0 >=dev-perl/File-Remove-1.420.0 >=virtual/perl-File-Spec-3.280.0 >=dev-perl/Module-Build-0.290.0 >=virtual/perl-Module-CoreList-2.170.0 >=dev-perl/Module-ScanDeps-1.90.0 >=virtual/perl-Parse-CPAN-Meta-1.441.300 >=dev-perl/YAML-Tiny-1.380.0 >=dev-perl/Archive-Zip-1.370.0 >=dev-perl/File-HomeDir-1 >=dev-perl/JSON-MaybeXS-1.3.3 >=dev-perl/libwww-perl-6 >=dev-perl/PAR-Dist-0.290.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Module-Install-1.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e4dcbdb0d67231c1ccc23cac7300f4f7
+_md5_=a70292841b4c5128e406402f73478dee
diff --git a/metadata/md5-cache/dev-perl/Module-Install-AuthorTests-0.2.0-r1 b/metadata/md5-cache/dev-perl/Module-Install-AuthorTests-0.2.0-r1
index e2fa63b79833..c66e00fdd91f 100644
--- a/metadata/md5-cache/dev-perl/Module-Install-AuthorTests-0.2.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Install-AuthorTests-0.2.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Module-Install dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Module-Install-AuthorTests-0.002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=701448ecaf5d9a1c06943775efe8ba00
+_md5_=19489baefb06ff8a02baa2451a77f7e4
diff --git a/metadata/md5-cache/dev-perl/Module-Locate-1.800.0 b/metadata/md5-cache/dev-perl/Module-Locate-1.800.0
index bc0b2953ccf0..590c30a06f51 100644
--- a/metadata/md5-cache/dev-perl/Module-Locate-1.800.0
+++ b/metadata/md5-cache/dev-perl/Module-Locate-1.800.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Module-Locate-1.80.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=17462d63b587ff314f252c57f7711a84
+_md5_=207aa9bb736b8284631535cc3d6fb13f
diff --git a/metadata/md5-cache/dev-perl/Module-Manifest-1.80.0-r1 b/metadata/md5-cache/dev-perl/Module-Manifest-1.80.0-r1
index 3b8ac934672a..f44d0cb8bae4 100644
--- a/metadata/md5-cache/dev-perl/Module-Manifest-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Manifest-1.80.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Params-Util-0.10 >=virtual/perl-File-Spec-0.80 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Module-Manifest-1.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cc93a8938bc6b48cbceb40a3125fbd2c
+_md5_=469085f1af34b3d08b4cf207a7aff7ed
diff --git a/metadata/md5-cache/dev-perl/Module-Path-0.190.0 b/metadata/md5-cache/dev-perl/Module-Path-0.190.0
index 83cbb5329777..34263d56a82b 100644
--- a/metadata/md5-cache/dev-perl/Module-Path-0.190.0
+++ b/metadata/md5-cache/dev-perl/Module-Path-0.190.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Exporter virtual/perl-Getopt-Long dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Module-Path-0.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5d5fc0bda581141c379ea7ddccfa044d
+_md5_=65b98b7833f3cb7408034fe9075ff8dd
diff --git a/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0 b/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
index 9fa0d6a29c0f..4cdcad8f61e5 100644
--- a/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
+++ b/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-3 virtual/perl-if dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=346998b58706d18b63842ef8757aeb19
+_md5_=63b544f5d2904df52bf6ba4af3a7d1f9
diff --git a/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1 b/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
index ca93e01fed42..30526498763b 100644
--- a/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=038cb703572b120b2f0d23293935012e
+_md5_=9e227ad5d67ce436ae527a72af5cde1e
diff --git a/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0 b/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0
index 8720cb24f82e..3997b1be6682 100644
--- a/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0
+++ b/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=76c9e658dc6891728039793fbe0d4df4
+_md5_=0324ab9872b13c9e3f5f544d92641ade
diff --git a/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.2.0 b/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.2.0
index 2ffa239dc600..c0d59a5ad478 100644
--- a/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.2.0
+++ b/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.2.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm hppa ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Dist-CheckConflicts dev-perl/Module-Runtime dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.002.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cad56f77efacf94ad9a54d6922eed2d8
+_md5_=a4957705eb9b5e164acba8dce2bd9a49
diff --git a/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.3.0 b/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.3.0
index 317914ea1971..48ba36c53e1e 100644
--- a/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.3.0
+++ b/metadata/md5-cache/dev-perl/Module-Runtime-Conflicts-0.3.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Dist-CheckConflicts dev-perl/Module-Runtime dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1792755461936846f832fb9d39492f67
+_md5_=7abca802e92a31a3b6f78c6f9c995520
diff --git a/metadata/md5-cache/dev-perl/Module-ScanDeps-1.230.0 b/metadata/md5-cache/dev-perl/Module-ScanDeps-1.230.0
index 4067dd5045bd..c11c68606e97 100644
--- a/metadata/md5-cache/dev-perl/Module-ScanDeps-1.230.0
+++ b/metadata/md5-cache/dev-perl/Module-ScanDeps-1.230.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-Module-Metadata virtual/perl-Text-ParseWords virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6498703986c7e0d1f14586949ad1b2c9
+_md5_=ce6366fa804d4a01e83b2d08f11cceea
diff --git a/metadata/md5-cache/dev-perl/Module-ScanDeps-1.240.0 b/metadata/md5-cache/dev-perl/Module-ScanDeps-1.240.0
index 49353d2c58ab..e95cd39fb28e 100644
--- a/metadata/md5-cache/dev-perl/Module-ScanDeps-1.240.0
+++ b/metadata/md5-cache/dev-perl/Module-ScanDeps-1.240.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-Module-Metadata virtual/perl-Text-ParseWords virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=705b6d97905ec2b483163c11061892c4
+_md5_=f82258a1a532daf57bd11d9e84fb99b3
diff --git a/metadata/md5-cache/dev-perl/Module-Signature-0.810.0 b/metadata/md5-cache/dev-perl/Module-Signature-0.810.0
index b0f705981e1d..38208a6226be 100644
--- a/metadata/md5-cache/dev-perl/Module-Signature-0.810.0
+++ b/metadata/md5-cache/dev-perl/Module-Signature-0.810.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~x86-solaris
 LICENSE=CC0-1.0 || ( Artistic GPL-2+ )
 RDEPEND=dev-perl/Crypt-OpenPGP app-crypt/gnupg virtual/perl-File-Temp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.81.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f6cda19c624689a70cbb151a31213fa8
+_md5_=a2a70a032248bb600d989c535bd0e76b
diff --git a/metadata/md5-cache/dev-perl/Module-Starter-1.730.0 b/metadata/md5-cache/dev-perl/Module-Starter-1.730.0
index 5769dd752b41..91f3062a60ff 100644
--- a/metadata/md5-cache/dev-perl/Module-Starter-1.730.0
+++ b/metadata/md5-cache/dev-perl/Module-Starter-1.730.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Module-Runtime >=virtual/perl-Pod-Parser-1.210.0 virtual/perl-parent >=virtual/perl-version-0.770.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DB/DBOOK/Module-Starter-1.73.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3ef539157d1363500cac76b0022d6628
+_md5_=3ccceb369ff5fcf368dbfdc58fd26e6c
diff --git a/metadata/md5-cache/dev-perl/Module-Util-1.90.0 b/metadata/md5-cache/dev-perl/Module-Util-1.90.0
index 961f8ab2ea25..276fc239d2a7 100644
--- a/metadata/md5-cache/dev-perl/Module-Util-1.90.0
+++ b/metadata/md5-cache/dev-perl/Module-Util-1.90.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=95f4341eabe82e156cb13bf8f72a5180
+_md5_=eae6b7091ace663fff132689d47d52c4
diff --git a/metadata/md5-cache/dev-perl/Mojolicious-6.610.0 b/metadata/md5-cache/dev-perl/Mojolicious-6.610.0
index d5c563556bfa..67093066fb28 100644
--- a/metadata/md5-cache/dev-perl/Mojolicious-6.610.0
+++ b/metadata/md5-cache/dev-perl/Mojolicious-6.610.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/EV-4.0.0 ) >=virtual/perl-IO-Socket-IP-0.370.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Pod-Simple-3.90.0 >=virtual/perl-Time-Local-1.200.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRI/Mojolicious-6.61.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=004c35cd87a788f00fd22329a48cb0e5
+_md5_=a77561d479a9ab931ff44aad7953bbe7
diff --git a/metadata/md5-cache/dev-perl/Mojolicious-7.140.0 b/metadata/md5-cache/dev-perl/Mojolicious-7.140.0
index 4ff96f299fb1..bd80c427cb44 100644
--- a/metadata/md5-cache/dev-perl/Mojolicious-7.140.0
+++ b/metadata/md5-cache/dev-perl/Mojolicious-7.140.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/EV-4.0.0 ) >=virtual/perl-IO-Socket-IP-0.370.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Pod-Simple-3.90.0 >=virtual/perl-Time-Local-1.200.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRI/Mojolicious-7.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=03a62515418f1b23f4a7c45239709884
+_md5_=e1f997fbad61915fd66af5d114301c11
diff --git a/metadata/md5-cache/dev-perl/Mojolicious-7.190.0 b/metadata/md5-cache/dev-perl/Mojolicious-7.190.0
index f2a9184d6a3a..5fc502dbea5f 100644
--- a/metadata/md5-cache/dev-perl/Mojolicious-7.190.0
+++ b/metadata/md5-cache/dev-perl/Mojolicious-7.190.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/EV-4.0.0 ) >=virtual/perl-IO-Socket-IP-0.370.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Pod-Simple-3.90.0 >=virtual/perl-Time-Local-1.200.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRI/Mojolicious-7.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=be0efdea84afe078ed6007ba0e5fe01f
+_md5_=e2b7c8d837d8f2bc1a2e245805ccbcf1
diff --git a/metadata/md5-cache/dev-perl/Mojolicious-7.290.0 b/metadata/md5-cache/dev-perl/Mojolicious-7.290.0
index 150eed1e450e..bdc869c06e39 100644
--- a/metadata/md5-cache/dev-perl/Mojolicious-7.290.0
+++ b/metadata/md5-cache/dev-perl/Mojolicious-7.290.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/EV-4.0.0 ) >=virtual/perl-IO-Socket-IP-0.370.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Pod-Simple-3.90.0 >=virtual/perl-Time-Local-1.200.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRI/Mojolicious-7.29.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0f0415f29b7f636d408abdfa09faaee4
+_md5_=10372e61d761d2c00e8b2f2c5059b4c6
diff --git a/metadata/md5-cache/dev-perl/Mojolicious-7.300.0 b/metadata/md5-cache/dev-perl/Mojolicious-7.300.0
index ca67fdf5b814..7087475ec763 100644
--- a/metadata/md5-cache/dev-perl/Mojolicious-7.300.0
+++ b/metadata/md5-cache/dev-perl/Mojolicious-7.300.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/EV-4.0.0 ) >=virtual/perl-IO-Socket-IP-0.370.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Pod-Simple-3.90.0 >=virtual/perl-Time-Local-1.200.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRI/Mojolicious-7.30.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c896afb1c14eb7ab4e02cbeb70f46556
+_md5_=6a892702ef6020ffc298c373bd3b3c84
diff --git a/metadata/md5-cache/dev-perl/Mojolicious-7.570.0 b/metadata/md5-cache/dev-perl/Mojolicious-7.570.0
index 3391c45b5236..39cb41c2644f 100644
--- a/metadata/md5-cache/dev-perl/Mojolicious-7.570.0
+++ b/metadata/md5-cache/dev-perl/Mojolicious-7.570.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/EV-4.0.0 ) >=virtual/perl-IO-Socket-IP-0.370.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Pod-Simple-3.90.0 >=virtual/perl-Time-Local-1.200.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRI/Mojolicious-7.57.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6389c3a1cd9909d6826c48ed17c4d182
+_md5_=164bdf82006bad70405f521313c1485f
diff --git a/metadata/md5-cache/dev-perl/MongoDB-1.8.0 b/metadata/md5-cache/dev-perl/MongoDB-1.8.0
index 3ea3e0d53bfb..5cdae6cedd86 100644
--- a/metadata/md5-cache/dev-perl/MongoDB-1.8.0
+++ b/metadata/md5-cache/dev-perl/MongoDB-1.8.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=!minimal? ( >=virtual/perl-IO-Socket-IP-0.250.0 >=dev-perl/IO-Socket-SSL-1.560.0 >=dev-perl/Mozilla-CA-20130114 >=dev-perl/Net-SSLeay-1.490.0 ) >=dev-perl/Authen-SCRAM-0.3.0 dev-perl/BSON virtual/perl-Carp dev-perl/Class-XSAccessor >=dev-perl/DateTime-0.780.0 virtual/perl-Digest-MD5 virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 virtual/perl-IO virtual/perl-MIME-Base64 >=dev-perl/Moo-2 dev-perl/Safe-Isa virtual/perl-Scalar-List-Utils virtual/perl-Socket dev-perl/Tie-IxHash virtual/perl-Time-HiRes dev-perl/Try-Tiny dev-perl/Type-Tiny dev-perl/Type-Tiny-XS virtual/perl-XSLoader >=dev-perl/boolean-0.250.0 virtual/perl-if dev-perl/namespace-clean virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MO/MONGODB/MongoDB-v1.8.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c65e78e46f1064d3998da49c6c02271e
+_md5_=35db10ec032c22655f173259212e1fe0
diff --git a/metadata/md5-cache/dev-perl/Monitoring-Plugin-0.390.0 b/metadata/md5-cache/dev-perl/Monitoring-Plugin-0.390.0
index 8d3e6c259e77..067ef988240b 100644
--- a/metadata/md5-cache/dev-perl/Monitoring-Plugin-0.390.0
+++ b/metadata/md5-cache/dev-perl/Monitoring-Plugin-0.390.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-Accessor dev-perl/Config-Tiny virtual/perl-File-Spec dev-perl/Math-Calc-Units dev-perl/Params-Validate dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NIERLEIN/Monitoring-Plugin-0.39.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=876f5456ec7bbb8953d85859dd6c0811
+_md5_=266962abe1c5c301bb0d02a6a61fbd60
diff --git a/metadata/md5-cache/dev-perl/Monitoring-Plugin-0.400.0 b/metadata/md5-cache/dev-perl/Monitoring-Plugin-0.400.0
index 21937f5c1256..bb5bcf7131c2 100644
--- a/metadata/md5-cache/dev-perl/Monitoring-Plugin-0.400.0
+++ b/metadata/md5-cache/dev-perl/Monitoring-Plugin-0.400.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~hppa ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-Accessor dev-perl/Config-Tiny virtual/perl-File-Spec dev-perl/Math-Calc-Units dev-perl/Params-Validate dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NIERLEIN/Monitoring-Plugin-0.40.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=392f873b5ffdef84f2f3c2d1ab66e23b
+_md5_=46fa008dfaa2ba37c716b451b760ac4d
diff --git a/metadata/md5-cache/dev-perl/Moo-2.3.3 b/metadata/md5-cache/dev-perl/Moo-2.3.3
index 841671658f00..6c4a86ee1e4c 100644
--- a/metadata/md5-cache/dev-perl/Moo-2.3.3
+++ b/metadata/md5-cache/dev-perl/Moo-2.3.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Method-Modifiers-1.100.0 >=dev-perl/Devel-GlobalDestruction-0.110.0 >=virtual/perl-Exporter-5.570.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Role-Tiny-2.0.4 >=dev-perl/Sub-Quote-2.3.1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Moo-2.003003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=63d82116f2ba9e484a486739b8695a52
+_md5_=6a074e6ebd0a7776d175c94a48f5eaca
diff --git a/metadata/md5-cache/dev-perl/MooX-HandlesVia-0.1.8 b/metadata/md5-cache/dev-perl/MooX-HandlesVia-0.1.8
index f7910cdcdaf9..d3517b714850 100644
--- a/metadata/md5-cache/dev-perl/MooX-HandlesVia-0.1.8
+++ b/metadata/md5-cache/dev-perl/MooX-HandlesVia-0.1.8
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Method-Modifiers >=dev-perl/Data-Perl-0.2.6 dev-perl/Module-Runtime >=dev-perl/Moo-1.3.0 dev-perl/Role-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTP/MooX-HandlesVia-0.001008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1c0338dfa57afbd726bc3ba405085b0e
+_md5_=e3d1d627a384cb2c02f28906bdc5f16a
diff --git a/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0 b/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0
index a75b2cd91d67..e047f1ee6ab5 100644
--- a/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0
+++ b/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/strictures-2 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Moo-1.4.2 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-0.29.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=edacdcd6a8188c4dbfab4c788c97affa
+_md5_=56a36f3d826158c2d2bcccd508eafaaf
diff --git a/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-Numeric-1.30.0 b/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-Numeric-1.30.0
index 8ab5e96c28c4..0d63f7502ef6 100644
--- a/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-Numeric-1.30.0
+++ b/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-Numeric-1.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/MooX-Types-MooseLike-0.230.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-Numeric-1.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=37df086427916d730f45634b8f3e52e6
+_md5_=6fcd9eab272f08bd3ca6408c24824104
diff --git a/metadata/md5-cache/dev-perl/MooX-late-0.15.0 b/metadata/md5-cache/dev-perl/MooX-late-0.15.0
index 91d44b68466d..30cf4f579876 100644
--- a/metadata/md5-cache/dev-perl/MooX-late-0.15.0
+++ b/metadata/md5-cache/dev-perl/MooX-late-0.15.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moo-1.6.0 >=dev-perl/Type-Tiny-1.0.1 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.015.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a1a281676a81af891f51d838dab2148d
+_md5_=eb0f4d9eb65e10d573cf5f6c90ecbd14
diff --git a/metadata/md5-cache/dev-perl/MooX-late-0.15.0-r1 b/metadata/md5-cache/dev-perl/MooX-late-0.15.0-r1
index 3b0c272b6e3a..e8d4c2b59d9d 100644
--- a/metadata/md5-cache/dev-perl/MooX-late-0.15.0-r1
+++ b/metadata/md5-cache/dev-perl/MooX-late-0.15.0-r1
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moo-1.6.0 >=dev-perl/Type-Tiny-1.0.1 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.015.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9e5eb1fbde32c306efcf556fc17b4f85
+_md5_=7dbbcf72cad368a6824574fcdd37a1b7
diff --git a/metadata/md5-cache/dev-perl/Moose-2.160.500 b/metadata/md5-cache/dev-perl/Moose-2.160.500
index 350871f218ba..6c8e4b5c1841 100644
--- a/metadata/md5-cache/dev-perl/Moose-2.160.500
+++ b/metadata/md5-cache/dev-perl/Moose-2.160.500
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<=dev-perl/Catalyst-5.900.499.990 !<=dev-perl/Config-MVP-2.200.4 !<=dev-perl/Devel-REPL-1.3.20 !<=dev-perl/Dist-Zilla-Plugin-Git-2.16.0 !<=dev-perl/Fey-0.360.0 !<=dev-perl/Fey-ORM-0.420.0 !<=dev-perl/File-ChangeNotify-0.150.0 !<=dev-perl/HTTP-Throwable-0.17.0 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160.0 !<=dev-perl/Mason-2.180.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80.0 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-App-1.220.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.0 !<=dev-perl/MooseX-Attribute-Prototype-0.100.0 !<=dev-perl/MooseX-AttributeHelpers-0.220.0 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20.0 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.260.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.21.0 !<=dev-perl/MooseX-Declare-0.350.0 !<=dev-perl/MooseX-FollowPBP-0.20.0 !<=dev-perl/MooseX-Getopt-0.560.0 !<=dev-perl/MooseX-InstanceTracking-0.40.0 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Method-Signatures-0.440.0 !<=dev-perl/MooseX-MethodAttributes-0.220.0 !<=dev-perl/MooseX-NonMoose-0.240.0 !<=dev-perl/MooseX-Object-Pluggable-0.1.100 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50.0 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60.0 !<=dev-perl/MooseX-Role-Parameterized-1.0.0 !<=dev-perl/MooseX-Role-WithOverloading-0.140.0 !<=dev-perl/MooseX-Runnable-0.30.0 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.473 !<=dev-perl/MooseX-Singleton-0.250.0 !<=dev-perl/MooseX-SlurpyConstructor-1.100.0 !<=dev-perl/MoooseX-Storage-0.420.0 !<=dev-perl/MooseX-StrictConstructor-0.120.0 !<=dev-perl/MooseX-Traits-0.110.0 !<=dev-perl/MooseX-Types-0.190.0 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Set-Object-0.30.0 !<=dev-perl/MooseX-Types-Signal-1.101.930 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Pod-Weaver-3.101.638 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/Test-CleanNamespaces-0.30.0 !<=dev-perl/Test-Moose-More-0.22.0 !<=dev-perl/Test-TempDir-0.50.0 !<=dev-perl/Throwable-0.102.80 !<=dev-perl/namespace-autoclean-0.80.0 >=virtual/perl-Carp-1.220.0 >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Data-OptList-0.107.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Devel-OverloadInfo-0.4.0 >=dev-perl/Devel-StackTrace-1.330.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Eval-Closure-0.40.0 >=virtual/perl-JSON-PP-2.273.0 >=dev-perl/List-MoreUtils-0.280.0 >=dev-perl/MRO-Compat-0.50.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Module-Runtime-Conflicts-0.2.0 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.350.0 >=dev-perl/Sub-Exporter-0.980.0 dev-perl/Sub-Identify >=dev-perl/Sub-Name-0.50.0 dev-perl/Task-Weaken >=dev-perl/Try-Tiny-0.170.0 >=virtual/perl-parent-0.223.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Moose-2.1605.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2b73702660e6584281a797121db5614b
+_md5_=506367d89d323b0c5c46c557b7c3782e
diff --git a/metadata/md5-cache/dev-perl/Moose-2.180.600 b/metadata/md5-cache/dev-perl/Moose-2.180.600
index 4f82678f89b1..24246baf5471 100644
--- a/metadata/md5-cache/dev-perl/Moose-2.180.600
+++ b/metadata/md5-cache/dev-perl/Moose-2.180.600
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<=dev-perl/Catalyst-5.900.499.990 !<=dev-perl/Config-MVP-2.200.4 !<=dev-perl/Devel-REPL-1.3.20 !<=dev-perl/Dist-Zilla-5.43.0 !<=dev-perl/Dist-Zilla-Plugin-Git-2.16.0 !<=dev-perl/Fey-0.360.0 !<=dev-perl/Fey-ORM-0.420.0 !<=dev-perl/File-ChangeNotify-0.150.0 !<=dev-perl/HTTP-Throwable-0.17.0 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160.0 !<=dev-perl/Mason-2.180.0 !<=dev-perl/Moose-Autobox-0.150.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80.0 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-App-1.220.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.0 !<=dev-perl/MooseX-Attribute-Prototype-0.100.0 !<=dev-perl/MooseX-AttributeHelpers-0.220.0 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20.0 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.260.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.21.0 !<=dev-perl/MooseX-Declare-0.350.0 !<=dev-perl/MooseX-FollowPBP-0.20.0 !<=dev-perl/MooseX-Getopt-0.560.0 !<=dev-perl/MooseX-InstanceTracking-0.40.0 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Method-Signatures-0.440.0 !<=dev-perl/MooseX-MethodAttributes-0.220.0 !<=dev-perl/MooseX-NonMoose-0.240.0 !<=dev-perl/MooseX-Object-Pluggable-0.1.100 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50.0 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60.0 !<=dev-perl/MooseX-Role-Parameterized-1.0.0 !<=dev-perl/MooseX-Role-WithOverloading-0.140.0 !<=dev-perl/MooseX-Runnable-0.30.0 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.473 !<=dev-perl/MooseX-Singleton-0.250.0 !<=dev-perl/MooseX-SlurpyConstructor-1.100.0 !<=dev-perl/MooseX-Storage-0.420.0 !<=dev-perl/MooseX-StrictConstructor-0.120.0 !<=dev-perl/MooseX-Traits-0.110.0 !<=dev-perl/MooseX-Types-0.190.0 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Set-Object-0.30.0 !<=dev-perl/MooseX-Types-Signal-1.101.930 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Pod-Weaver-3.101.638 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/Test-CleanNamespaces-0.30.0 !<=dev-perl/Test-Moose-More-0.22.0 !<=dev-perl/Test-TempDir-0.50.0 !<=dev-perl/Throwable-0.102.80 !<=dev-perl/namespace-autoclean-0.80.0 >=virtual/perl-Carp-1.220.0 >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Data-OptList-0.110.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Devel-OverloadInfo-0.4.0 >=dev-perl/Devel-StackTrace-1.330.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Eval-Closure-0.40.0 >=dev-perl/MRO-Compat-0.50.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Module-Runtime-Conflicts-0.2.0 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Sub-Exporter-0.980.0 dev-perl/Sub-Identify >=dev-perl/Sub-Name-0.50.0 >=dev-perl/Try-Tiny-0.170.0 >=virtual/perl-parent-0.223.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Moose-2.1806.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d464e6d5199119cea964959b43daa648
+_md5_=7b95f0908ca488e9ea4ec85521972e5d
diff --git a/metadata/md5-cache/dev-perl/Moose-2.180.700 b/metadata/md5-cache/dev-perl/Moose-2.180.700
index 054314d7fa82..20f9f783725d 100644
--- a/metadata/md5-cache/dev-perl/Moose-2.180.700
+++ b/metadata/md5-cache/dev-perl/Moose-2.180.700
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<=dev-perl/Catalyst-5.900.499.990 !<=dev-perl/Config-MVP-2.200.4 !<=dev-perl/Devel-REPL-1.3.20 !<=dev-perl/Dist-Zilla-5.43.0 !<=dev-perl/Dist-Zilla-Plugin-Git-2.16.0 !<=dev-perl/Fey-0.360.0 !<=dev-perl/Fey-ORM-0.420.0 !<=dev-perl/File-ChangeNotify-0.150.0 !<=dev-perl/HTTP-Throwable-0.17.0 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160.0 !<=dev-perl/Mason-2.180.0 !<=dev-perl/Moose-Autobox-0.150.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80.0 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-App-1.220.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.0 !<=dev-perl/MooseX-Attribute-Prototype-0.100.0 !<=dev-perl/MooseX-AttributeHelpers-0.220.0 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20.0 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.260.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.21.0 !<=dev-perl/MooseX-Declare-0.350.0 !<=dev-perl/MooseX-FollowPBP-0.20.0 !<=dev-perl/MooseX-Getopt-0.560.0 !<=dev-perl/MooseX-InstanceTracking-0.40.0 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Method-Signatures-0.440.0 !<=dev-perl/MooseX-MethodAttributes-0.220.0 !<=dev-perl/MooseX-NonMoose-0.240.0 !<=dev-perl/MooseX-Object-Pluggable-0.1.100 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50.0 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60.0 !<=dev-perl/MooseX-Role-Parameterized-1.0.0 !<=dev-perl/MooseX-Role-WithOverloading-0.140.0 !<=dev-perl/MooseX-Runnable-0.30.0 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.473 !<=dev-perl/MooseX-Singleton-0.250.0 !<=dev-perl/MooseX-SlurpyConstructor-1.100.0 !<=dev-perl/MooseX-Storage-0.420.0 !<=dev-perl/MooseX-StrictConstructor-0.120.0 !<=dev-perl/MooseX-Traits-0.110.0 !<=dev-perl/MooseX-Types-0.190.0 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Set-Object-0.30.0 !<=dev-perl/MooseX-Types-Signal-1.101.930 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Pod-Weaver-3.101.638 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/Test-CleanNamespaces-0.30.0 !<=dev-perl/Test-Moose-More-0.22.0 !<=dev-perl/Test-TempDir-0.50.0 !<=dev-perl/Throwable-0.102.80 !<=dev-perl/namespace-autoclean-0.80.0 >=virtual/perl-Carp-1.220.0 >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Data-OptList-0.110.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Devel-OverloadInfo-0.4.0 >=dev-perl/Devel-StackTrace-1.330.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Eval-Closure-0.40.0 >=dev-perl/MRO-Compat-0.50.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Module-Runtime-Conflicts-0.2.0 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Sub-Exporter-0.980.0 dev-perl/Sub-Identify >=dev-perl/Sub-Name-0.50.0 >=dev-perl/Try-Tiny-0.170.0 >=virtual/perl-parent-0.223.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Moose-2.1807.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0f70b5bf6a7ca63214d96d83a29aafd6
+_md5_=4f1aebd699fb79bba1be2d4742315c4c
diff --git a/metadata/md5-cache/dev-perl/Moose-2.200.400 b/metadata/md5-cache/dev-perl/Moose-2.200.400
index 03ed38acc1a8..e2b503dd1043 100644
--- a/metadata/md5-cache/dev-perl/Moose-2.200.400
+++ b/metadata/md5-cache/dev-perl/Moose-2.200.400
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<=dev-perl/Catalyst-5.900.499.990 !<=dev-perl/Config-MVP-2.200.4 !<=dev-perl/Devel-REPL-1.3.20 !<=dev-perl/Dist-Zilla-5.43.0 !<=dev-perl/Dist-Zilla-Plugin-Git-2.16.0 !<=dev-perl/Fey-0.360.0 !<=dev-perl/Fey-ORM-0.420.0 !<=dev-perl/File-ChangeNotify-0.150.0 !<=dev-perl/HTTP-Throwable-0.17.0 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160.0 !<=dev-perl/Mason-2.180.0 !<=dev-perl/Moose-Autobox-0.150.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80.0 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-App-1.220.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.0 !<=dev-perl/MooseX-Attribute-Prototype-0.100.0 !<=dev-perl/MooseX-AttributeHelpers-0.220.0 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20.0 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.260.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.21.0 !<=dev-perl/MooseX-Declare-0.350.0 !<=dev-perl/MooseX-FollowPBP-0.20.0 !<=dev-perl/MooseX-Getopt-0.560.0 !<=dev-perl/MooseX-InstanceTracking-0.40.0 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Method-Signatures-0.440.0 !<=dev-perl/MooseX-MethodAttributes-0.220.0 !<=dev-perl/MooseX-NonMoose-0.240.0 !<=dev-perl/MooseX-Object-Pluggable-0.1.100 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50.0 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60.0 !<=dev-perl/MooseX-Role-Parameterized-1.0.0 !<=dev-perl/MooseX-Role-WithOverloading-0.140.0 !<=dev-perl/MooseX-Runnable-0.30.0 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.473 !<=dev-perl/MooseX-Singleton-0.250.0 !<=dev-perl/MooseX-SlurpyConstructor-1.100.0 !<=dev-perl/MooseX-Storage-0.420.0 !<=dev-perl/MooseX-StrictConstructor-0.120.0 !<=dev-perl/MooseX-Traits-0.110.0 !<=dev-perl/MooseX-Types-0.190.0 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Set-Object-0.30.0 !<=dev-perl/MooseX-Types-Signal-1.101.930 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Pod-Weaver-3.101.638 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/Test-CleanNamespaces-0.30.0 !<=dev-perl/Test-Moose-More-0.22.0 !<=dev-perl/Test-TempDir-0.50.0 !<=dev-perl/Throwable-0.102.80 !<=dev-perl/namespace-autoclean-0.80.0 >=virtual/perl-Carp-1.220.0 >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Data-OptList-0.110.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Devel-OverloadInfo-0.4.0 >=dev-perl/Devel-StackTrace-1.330.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Eval-Closure-0.40.0 >=dev-perl/MRO-Compat-0.50.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Module-Runtime-Conflicts-0.2.0 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Sub-Exporter-0.980.0 dev-perl/Sub-Identify >=dev-perl/Sub-Name-0.200.0 >=dev-perl/Try-Tiny-0.170.0 >=virtual/perl-parent-0.223.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8f6db78d7bb735973a1a4fb90641bb4e
+_md5_=1eb47ced5e4efe1f991c704192017b41
diff --git a/metadata/md5-cache/dev-perl/Moose-2.200.500 b/metadata/md5-cache/dev-perl/Moose-2.200.500
index 7d2a7e8fa77d..33a62b52b581 100644
--- a/metadata/md5-cache/dev-perl/Moose-2.200.500
+++ b/metadata/md5-cache/dev-perl/Moose-2.200.500
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<=dev-perl/Catalyst-5.900.499.990 !<=dev-perl/Config-MVP-2.200.4 !<=dev-perl/Devel-REPL-1.3.20 !<=dev-perl/Dist-Zilla-5.43.0 !<=dev-perl/Dist-Zilla-Plugin-Git-2.16.0 !<=dev-perl/Fey-0.360.0 !<=dev-perl/Fey-ORM-0.420.0 !<=dev-perl/File-ChangeNotify-0.150.0 !<=dev-perl/HTTP-Throwable-0.17.0 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160.0 !<=dev-perl/Mason-2.180.0 !<=dev-perl/Moose-Autobox-0.150.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80.0 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-App-1.220.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.0 !<=dev-perl/MooseX-Attribute-Prototype-0.100.0 !<=dev-perl/MooseX-AttributeHelpers-0.220.0 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20.0 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.260.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.21.0 !<=dev-perl/MooseX-Declare-0.350.0 !<=dev-perl/MooseX-FollowPBP-0.20.0 !<=dev-perl/MooseX-Getopt-0.560.0 !<=dev-perl/MooseX-InstanceTracking-0.40.0 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Method-Signatures-0.440.0 !<=dev-perl/MooseX-MethodAttributes-0.220.0 !<=dev-perl/MooseX-NonMoose-0.240.0 !<=dev-perl/MooseX-Object-Pluggable-0.1.100 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50.0 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60.0 !<=dev-perl/MooseX-Role-Parameterized-1.0.0 !<=dev-perl/MooseX-Role-WithOverloading-0.140.0 !<=dev-perl/MooseX-Runnable-0.30.0 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.473 !<=dev-perl/MooseX-Singleton-0.250.0 !<=dev-perl/MooseX-SlurpyConstructor-1.100.0 !<=dev-perl/MooseX-Storage-0.420.0 !<=dev-perl/MooseX-StrictConstructor-0.120.0 !<=dev-perl/MooseX-Traits-0.110.0 !<=dev-perl/MooseX-Types-0.190.0 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Set-Object-0.30.0 !<=dev-perl/MooseX-Types-Signal-1.101.930 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Pod-Weaver-3.101.638 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/Test-CleanNamespaces-0.30.0 !<=dev-perl/Test-Moose-More-0.22.0 !<=dev-perl/Test-TempDir-0.50.0 !<=dev-perl/Throwable-0.102.80 !<=dev-perl/namespace-autoclean-0.80.0 >=virtual/perl-Carp-1.220.0 >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Data-OptList-0.110.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Devel-OverloadInfo-0.4.0 >=dev-perl/Devel-StackTrace-1.330.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Eval-Closure-0.40.0 >=dev-perl/MRO-Compat-0.50.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Module-Runtime-Conflicts-0.2.0 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Sub-Exporter-0.980.0 dev-perl/Sub-Identify >=dev-perl/Sub-Name-0.200.0 >=dev-perl/Try-Tiny-0.170.0 >=virtual/perl-parent-0.223.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ea699787c2dceff67da917b2d06ff297
+_md5_=cdf9c1520020912fb2cf36c172ba98d2
diff --git a/metadata/md5-cache/dev-perl/Moose-2.200.700 b/metadata/md5-cache/dev-perl/Moose-2.200.700
index a4017e785de5..15155156275c 100644
--- a/metadata/md5-cache/dev-perl/Moose-2.200.700
+++ b/metadata/md5-cache/dev-perl/Moose-2.200.700
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<=dev-perl/Catalyst-5.900.499.990 !<=dev-perl/Config-MVP-2.200.4 !<=dev-perl/Devel-REPL-1.3.20 !<=dev-perl/Dist-Zilla-5.43.0 !<=dev-perl/Dist-Zilla-Plugin-Git-2.16.0 !<=dev-perl/Fey-0.360.0 !<=dev-perl/Fey-ORM-0.420.0 !<=dev-perl/File-ChangeNotify-0.150.0 !<=dev-perl/HTTP-Throwable-0.17.0 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160.0 !<=dev-perl/Mason-2.180.0 !<=dev-perl/Moose-Autobox-0.150.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80.0 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-App-1.220.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.3 !<=dev-perl/MooseX-Attribute-Prototype-0.100.0 !<=dev-perl/MooseX-AttributeHelpers-0.220.0 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20.0 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.260.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.21.0 !<=dev-perl/MooseX-Declare-0.350.0 !<=dev-perl/MooseX-FollowPBP-0.20.0 !<=dev-perl/MooseX-Getopt-0.560.0 !<=dev-perl/MooseX-InstanceTracking-0.40.0 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Method-Signatures-0.440.0 !<=dev-perl/MooseX-MethodAttributes-0.220.0 !<=dev-perl/MooseX-NonMoose-0.240.0 !<=dev-perl/MooseX-Object-Pluggable-0.1.100 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50.0 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60.0 !<=dev-perl/MooseX-Role-Parameterized-1.0.0 !<=dev-perl/MooseX-Role-WithOverloading-0.140.0 !<=dev-perl/MooseX-Runnable-0.30.0 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.473 !<=dev-perl/MooseX-Singleton-0.250.0 !<=dev-perl/MooseX-SlurpyConstructor-1.100.0 !<=dev-perl/MooseX-Storage-0.420.0 !<=dev-perl/MooseX-StrictConstructor-0.120.0 !<=dev-perl/MooseX-Traits-0.110.0 !<=dev-perl/MooseX-Types-0.190.0 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Set-Object-0.30.0 !<=dev-perl/MooseX-Types-Signal-1.101.930 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Pod-Weaver-3.101.638 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/Test-CleanNamespaces-0.30.0 !<=dev-perl/Test-Moose-More-0.22.0 !<=dev-perl/Test-TempDir-0.50.0 !<=dev-perl/Throwable-0.102.80 !<=dev-perl/namespace-autoclean-0.80.0 >=virtual/perl-Carp-1.220.0 >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Data-OptList-0.110.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Devel-OverloadInfo-0.4.0 >=dev-perl/Devel-StackTrace-1.330.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Eval-Closure-0.40.0 >=dev-perl/MRO-Compat-0.50.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Module-Runtime-Conflicts-0.2.0 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Sub-Exporter-0.980.0 dev-perl/Sub-Identify >=dev-perl/Sub-Name-0.200.0 >=dev-perl/Try-Tiny-0.170.0 >=virtual/perl-parent-0.223.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=616c380fcd03d0ae71057f279aa9ebaa
+_md5_=a162481f2ea60d49ff912c7a9548e39e
diff --git a/metadata/md5-cache/dev-perl/Moose-Autobox-0.160.0 b/metadata/md5-cache/dev-perl/Moose-Autobox-0.160.0
index a3e2c6d63ad1..692a75753d24 100644
--- a/metadata/md5-cache/dev-perl/Moose-Autobox-0.160.0
+++ b/metadata/md5-cache/dev-perl/Moose-Autobox-0.160.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper >=dev-perl/List-MoreUtils-0.70.0 >=dev-perl/Moose-0.420.0 virtual/perl-Scalar-List-Utils dev-perl/Syntax-Keyword-Junction >=dev-perl/autobox-2.230.0 dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Moose-Autobox-0.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a25ce57c7ecd4a9b7c4a74f3b41be03e
+_md5_=e76b00217c441aa69e10097d383228af
diff --git a/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1 b/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
index 0903ec3bbace..c261918c7ca9 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moose-1.90.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/MooseX-Aliases-0.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a980cf111a404fa78e88f7faebf85453
+_md5_=d7e922d24a5c3baa86b539a36db3bc3f
diff --git a/metadata/md5-cache/dev-perl/MooseX-ClassAttribute-0.290.0 b/metadata/md5-cache/dev-perl/MooseX-ClassAttribute-0.290.0
index 4d76b7e663d4..9e8daa93482f 100644
--- a/metadata/md5-cache/dev-perl/MooseX-ClassAttribute-0.290.0
+++ b/metadata/md5-cache/dev-perl/MooseX-ClassAttribute-0.290.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Moose-2.0.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/namespace-autoclean-0.110.0 >=dev-perl/namespace-clean-0.200.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-ClassAttribute-0.29.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2a2491b0be91d8b5b27e9957ddb51f34
+_md5_=1194dae3a0976ed775f4fb71236f4c02
diff --git a/metadata/md5-cache/dev-perl/MooseX-ConfigFromFile-0.140.0-r1 b/metadata/md5-cache/dev-perl/MooseX-ConfigFromFile-0.140.0-r1
index 02f9aadec9e1..8d4b065df7e1 100644
--- a/metadata/md5-cache/dev-perl/MooseX-ConfigFromFile-0.140.0-r1
+++ b/metadata/md5-cache/dev-perl/MooseX-ConfigFromFile-0.140.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Moose dev-perl/MooseX-Types >=dev-perl/MooseX-Types-Path-Tiny-0.5.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-ConfigFromFile-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=38855558b3c3ded953dc771ff945702b
+_md5_=5325848f79668a9f8d91e66e54211b42
diff --git a/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0-r1 b/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0-r1
index 0fa72e94a90a..90e19113b24b 100644
--- a/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Moose-1.160.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-FollowPBP-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bde7088719fbb358a96bf6f6981d5559
+_md5_=4a89bdfe7120003f825f98fee94e04fc
diff --git a/metadata/md5-cache/dev-perl/MooseX-Getopt-0.740.0 b/metadata/md5-cache/dev-perl/MooseX-Getopt-0.740.0
index c645d8d0f0b7..c033928b5ddc 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Getopt-0.740.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Getopt-0.740.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Getopt-Long-2.370.0 >=dev-perl/Getopt-Long-Descriptive-0.88.0 >=dev-perl/Moose-0.560.0 >=dev-perl/MooseX-Role-Parameterized-1.10.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.74.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=aa9bd79086cb057a5c665f03016e0d19
+_md5_=65aabdf475de26569753afa0725e81d3
diff --git a/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100 b/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
index 5f936b90ea0c..034c2a2c6e8f 100644
--- a/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
+++ b/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moose-0.96 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/MooseX-GlobRef-0.0701.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=430b9d77473d819881e95e1547542fe0
+_md5_=a1f40fefb836dc4d5a97f26d10b47204
diff --git a/metadata/md5-cache/dev-perl/MooseX-Has-Sugar-1.0.6 b/metadata/md5-cache/dev-perl/MooseX-Has-Sugar-1.0.6
index 6ca0d25c2caf..e73d14e1471f 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Has-Sugar-1.0.6
+++ b/metadata/md5-cache/dev-perl/MooseX-Has-Sugar-1.0.6
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Sub-Exporter-Progressive dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/MooseX-Has-Sugar-1.000006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bf205e85731b33a16db7e0f16b0755fb
+_md5_=53ac4d3602c358bb53b009779a12b3ca
diff --git a/metadata/md5-cache/dev-perl/MooseX-LazyRequire-0.110.0 b/metadata/md5-cache/dev-perl/MooseX-LazyRequire-0.110.0
index eb64b60187d5..359f921e3940 100644
--- a/metadata/md5-cache/dev-perl/MooseX-LazyRequire-0.110.0
+++ b/metadata/md5-cache/dev-perl/MooseX-LazyRequire-0.110.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Moose-0.940.0 >=dev-perl/aliased-0.300.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a8b5b5207f90839c83ece91460dfbd3a
+_md5_=3a2e71191c612df826b471604461c52e
diff --git a/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0 b/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
index 30cbfeaac120..8dc8dea0002d 100644
--- a/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
+++ b/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FRODWITH/MooseX-MultiInitArg-0.02.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9c733bc65167ade7203ecc8ac907d227
+_md5_=7a2d9188d430add35ae754e71399f122
diff --git a/metadata/md5-cache/dev-perl/MooseX-Object-Pluggable-0.1.400 b/metadata/md5-cache/dev-perl/MooseX-Object-Pluggable-0.1.400
index 1b57e2a9186c..91339dd22a55 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Object-Pluggable-0.1.400
+++ b/metadata/md5-cache/dev-perl/MooseX-Object-Pluggable-0.1.400
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Module-Pluggable dev-perl/Module-Runtime dev-perl/Moose virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Object-Pluggable-0.0014.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4f3dd822a3393cdce242925ec0c4029a
+_md5_=a1b7127766d9ed82118727bb9d7e9f9d
diff --git a/metadata/md5-cache/dev-perl/MooseX-OneArgNew-0.5.0 b/metadata/md5-cache/dev-perl/MooseX-OneArgNew-0.5.0
index 128834b6e9bb..fe2887af86e1 100644
--- a/metadata/md5-cache/dev-perl/MooseX-OneArgNew-0.5.0
+++ b/metadata/md5-cache/dev-perl/MooseX-OneArgNew-0.5.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose >=dev-perl/MooseX-Role-Parameterized-1.10.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=28965c03ed590b30863bba674d087d00
+_md5_=dc66a2bba1ad5b2a51666fdd8955e221
diff --git a/metadata/md5-cache/dev-perl/MooseX-Params-Validate-0.210.0 b/metadata/md5-cache/dev-perl/MooseX-Params-Validate-0.210.0
index 8a297327eb6b..8a68a566dc85 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Params-Validate-0.210.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Params-Validate-0.210.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Devel-Caller >=dev-perl/Moose-2.120.0 >=dev-perl/Params-Validate-1.150.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-0.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9dccd78b6b3b2f722899aec11669c001
+_md5_=f5ea41ccfe76a8db839c44d6020d1334
diff --git a/metadata/md5-cache/dev-perl/MooseX-Role-Parameterized-1.100.0 b/metadata/md5-cache/dev-perl/MooseX-Role-Parameterized-1.100.0
index bebd9dae247e..398d56c43f1c 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Role-Parameterized-1.100.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Role-Parameterized-1.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<=dev-perl/MooseX-Storage-0.460.0 virtual/perl-Carp dev-perl/Module-Runtime >=dev-perl/Moose-2.30.0 dev-perl/namespace-autoclean >=dev-perl/namespace-clean-0.190.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=45252b9741f635fbe658ea7d2c469c5d
+_md5_=48b0b7c67c1b205d9016c2dc87b7dea1
diff --git a/metadata/md5-cache/dev-perl/MooseX-Role-WithOverloading-0.170.0 b/metadata/md5-cache/dev-perl/MooseX-Role-WithOverloading-0.170.0
index c21e63d5d61b..f927020b0ed4 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Role-WithOverloading-0.170.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Role-WithOverloading-0.170.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moose-0.940.0 dev-perl/aliased >=dev-perl/namespace-autoclean-0.160.0 >=dev-perl/namespace-clean-0.190.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3b7e4f88e65389fb023a56ec3b63bc8d
+_md5_=af4534c702a8263ffd6ab674d279f981
diff --git a/metadata/md5-cache/dev-perl/MooseX-SetOnce-0.200.2 b/metadata/md5-cache/dev-perl/MooseX-SetOnce-0.200.2
index 5afc41f482af..a91a153165a8 100644
--- a/metadata/md5-cache/dev-perl/MooseX-SetOnce-0.200.2
+++ b/metadata/md5-cache/dev-perl/MooseX-SetOnce-0.200.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moose-0.900.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/MooseX-SetOnce-0.200002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7a432bd00553562d93ad8739240f0cf2
+_md5_=230d725e8a3cb5a908a8740b90465e7a
diff --git a/metadata/md5-cache/dev-perl/MooseX-SimpleConfig-0.110.0 b/metadata/md5-cache/dev-perl/MooseX-SimpleConfig-0.110.0
index 1dcb35bec9df..bc8fd2a26294 100644
--- a/metadata/md5-cache/dev-perl/MooseX-SimpleConfig-0.110.0
+++ b/metadata/md5-cache/dev-perl/MooseX-SimpleConfig-0.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MooseX-ConfigFromFile >=dev-perl/Moose-0.350.0 >=dev-perl/Config-Any-0.130.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-SimpleConfig-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=99850613e6d43b0a8d95ae43a4dcde92
+_md5_=9f73f9de24509dcd0817d930468fe5c5
diff --git a/metadata/md5-cache/dev-perl/MooseX-StrictConstructor-0.210.0 b/metadata/md5-cache/dev-perl/MooseX-StrictConstructor-0.210.0
index e16abc1eed95..1c74561de696 100644
--- a/metadata/md5-cache/dev-perl/MooseX-StrictConstructor-0.210.0
+++ b/metadata/md5-cache/dev-perl/MooseX-StrictConstructor-0.210.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Moose-0.940.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-StrictConstructor-0.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e48ad8d71728f787ec725eebee89d7f7
+_md5_=1acabca7b95a1664fc403e6050c54317
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-0.500.0 b/metadata/md5-cache/dev-perl/MooseX-Types-0.500.0
index ed99549c3d07..eb352ebc43be 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-0.500.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-0.500.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Carp-Clan-6 virtual/perl-Exporter dev-perl/Module-Runtime >=dev-perl/Moose-1.60.0 >=virtual/perl-Scalar-List-Utils-1.190.0 dev-perl/Sub-Exporter >=dev-perl/Sub-Exporter-ForMethods-0.100.52 dev-perl/Sub-Install dev-perl/Sub-Name >=dev-perl/namespace-autoclean-0.160.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.50.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ce088b9c8ebc87e2c3cb1220c010edb4
+_md5_=9d5a2f5be432d84b7b90c5b1cf086bec
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-0.130.0 b/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-0.130.0
index b9994c5ff8d0..f9ade95a02a7 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-0.130.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-0.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.430.200 >=dev-perl/DateTime-Locale-0.400.100 >=dev-perl/DateTime-TimeZone-0.950.0 >=dev-perl/Moose-0.410.0 >=dev-perl/MooseX-Types-0.300.0 >=dev-perl/namespace-clean-0.190.0 virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=80b975cfae736e520af72d829d754472
+_md5_=86aa19d466f20349bbe6b19ac647a248
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-ButMaintained-0.160.0 b/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-ButMaintained-0.160.0
index 36744a595945..124b665b5f1b 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-ButMaintained-0.160.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-ButMaintained-0.160.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.43.02 >=dev-perl/DateTime-Format-DateParse-0.04 >=dev-perl/DateTime-Format-Flexible-0.05 >=dev-perl/DateTime-Format-Natural-0.71 >=dev-perl/DateTime-Locale-0.40.01 >=dev-perl/DateTime-TimeZone-0.77.01 >=dev-perl/DateTimeX-Easy-0.082 >=dev-perl/Moose-0.41 >=dev-perl/MooseX-Types-0.300.0 dev-perl/namespace-autoclean >=dev-perl/Olson-Abbreviations-0.30.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EC/ECARROLL/MooseX-Types-DateTime-ButMaintained-0.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ada00b817dd2509b854a0cef77949283
+_md5_=a4a07564d26b0e7acb77b11369fc238b
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-MoreCoercions-0.150.0 b/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-MoreCoercions-0.150.0
index dd2c483b2185..e2f047b21c84 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-MoreCoercions-0.150.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-MoreCoercions-0.150.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.430.200 >=dev-perl/DateTimeX-Easy-0.85.0 >=dev-perl/Moose-0.410.0 >=dev-perl/MooseX-Types-0.40.0 >=dev-perl/MooseX-Types-DateTime-0.70.0 >=dev-perl/Time-Duration-Parse-0.60.0 virtual/perl-if >=dev-perl/namespace-clean-0.190.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-MoreCoercions-0.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ef727219b2416ad246c147c5d1a59f25
+_md5_=813e7be6e630428fafa7c292a83125d4
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-DateTimeX-0.100.0 b/metadata/md5-cache/dev-perl/MooseX-Types-DateTimeX-0.100.0
index 285a93ef1200..530ea86669ed 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-DateTimeX-0.100.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-DateTimeX-0.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTimeX-Easy-0.85.0 >=dev-perl/Moose-0.410.0 >=dev-perl/MooseX-Types-0.40.0 >=dev-perl/MooseX-Types-DateTime-ButMaintained-0.40.0 >=dev-perl/Time-Duration-Parse-0.60.0 >=dev-perl/namespace-clean-0.80.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EC/ECARROLL/MooseX-Types-DateTimeX-0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3d45b962cd521f38a8563c91c879b225
+_md5_=f21fff14738f942201622f9b580882cb
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-Path-Class-0.90.0 b/metadata/md5-cache/dev-perl/MooseX-Types-Path-Class-0.90.0
index a0640feb3cd3..5175d7b64d74 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-Path-Class-0.90.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-Path-Class-0.90.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MooseX-Types >=dev-perl/Path-Class-0.160.0 virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Class-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dfd8fb50241b88c7aa1492032737480e
+_md5_=37897eab33a32f87854ff0239fc03ed0
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-Path-Tiny-0.12.0 b/metadata/md5-cache/dev-perl/MooseX-Types-Path-Tiny-0.12.0
index bb074d9c3c69..9d408d8d8fed 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-Path-Tiny-0.12.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-Path-Tiny-0.12.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-perl/Moose-2.0.0 dev-perl/MooseX-Getopt dev-perl/MooseX-Types dev-perl/MooseX-Types-Stringlike dev-perl/Path-Tiny virtual/perl-if dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.012.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=25794a23a1315aca208844d41d70b4e7
+_md5_=70894e252a68333af6b5e77a8cc8e9bd
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-Perl-0.101.343 b/metadata/md5-cache/dev-perl/MooseX-Types-Perl-0.101.343
index 1b4253afa4ba..b04569291144 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-Perl-0.101.343
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-Perl-0.101.343
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MooseX-Types dev-perl/Params-Util >=virtual/perl-version-0.820.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101343.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e373e08d7e35a8db5b41ea3954c809b9
+_md5_=d7e1a9abfda04ffb344194668c8e7384
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-Stringlike-0.3.0 b/metadata/md5-cache/dev-perl/MooseX-Types-Stringlike-0.3.0
index f400d2bd1c5c..9fcd70109724 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-Stringlike-0.3.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-Stringlike-0.3.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-perl/MooseX-Types dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=20dcad4c4a0e6ef4c1633b630237ca80
+_md5_=adf92806216bc3bc940681d8fd54cf1d
diff --git a/metadata/md5-cache/dev-perl/Mouse-2.4.10 b/metadata/md5-cache/dev-perl/Mouse-2.4.10
index 1a1d6fec60f5..7ce71e17fa63 100644
--- a/metadata/md5-cache/dev-perl/Mouse-2.4.10
+++ b/metadata/md5-cache/dev-perl/Mouse-2.4.10
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.140.0 >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Mouse-v2.4.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e63a81d2e3f1d87038f985c792356edc
+_md5_=95236aab66f47a656035c992be8e1f41
diff --git a/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2 b/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2
index d19682d65a9e..d50a312b70a1 100644
--- a/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2
+++ b/metadata/md5-cache/dev-perl/MouseX-NativeTraits-1.90.0-r2
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Mouse-0.820.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/MouseX-NativeTraits-1.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b7e310ac72e7e1e29a996a631516db7b
+_md5_=594cc5bf48238300c23ec51035e076a2
diff --git a/metadata/md5-cache/dev-perl/MouseX-Types-0.60.0 b/metadata/md5-cache/dev-perl/MouseX-Types-0.60.0
index effed0f91bdf..2ab1feaf4f72 100644
--- a/metadata/md5-cache/dev-perl/MouseX-Types-0.60.0
+++ b/metadata/md5-cache/dev-perl/MouseX-Types-0.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Any-Moose-0.150.0 >=dev-perl/Mouse-0.770.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Types-0.06.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6d51261a56254ccffa3323fece2996c5
+_md5_=bb711a5ff19487197d7b30cab7c2590f
diff --git a/metadata/md5-cache/dev-perl/MouseX-Types-0.60.0-r1 b/metadata/md5-cache/dev-perl/MouseX-Types-0.60.0-r1
index 49a97cb59b25..b58e4f05dbba 100644
--- a/metadata/md5-cache/dev-perl/MouseX-Types-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/MouseX-Types-0.60.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Any-Moose-0.150.0 >=dev-perl/Mouse-0.770.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Types-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c9211444ab9936b49986c607cca4a15c
+_md5_=39ee842a9201c49e8e47b38312a1e778
diff --git a/metadata/md5-cache/dev-perl/Mozilla-PublicSuffix-1.0.0 b/metadata/md5-cache/dev-perl/Mozilla-PublicSuffix-1.0.0
index 83629a6212a0..a48e13ffc946 100644
--- a/metadata/md5-cache/dev-perl/Mozilla-PublicSuffix-1.0.0
+++ b/metadata/md5-cache/dev-perl/Mozilla-PublicSuffix-1.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-perl/URI dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSIMOES/Mozilla-PublicSuffix-v1.0.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d05adffad75cc6e186e4672d21726e5e
+_md5_=2e955807e89874b5844223346a428126
diff --git a/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0 b/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0
index 9c4c2b365c20..02d6f3744cf0 100644
--- a/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0
+++ b/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdiscid-0.2.2 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4500c6c5862c3dab38277ddde6ecfe32
+_md5_=0a8a2966acd91552ff489e316840c555
diff --git a/metadata/md5-cache/dev-perl/Net-Amazon-S3-0.800.0 b/metadata/md5-cache/dev-perl/Net-Amazon-S3-0.800.0
index b7ce5b3ad0e8..cb8734e5197e 100644
--- a/metadata/md5-cache/dev-perl/Net-Amazon-S3-0.800.0
+++ b/metadata/md5-cache/dev-perl/Net-Amazon-S3-0.800.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Data-Stream-Bulk dev-perl/DateTime-Format-HTTP dev-perl/Digest-HMAC virtual/perl-Digest-MD5 dev-perl/Digest-MD5-File dev-perl/File-Find-Rule virtual/perl-Getopt-Long dev-perl/HTTP-Date dev-perl/HTTP-Message virtual/perl-IO >=dev-perl/libwww-perl-6.30.0 dev-perl/LWP-UserAgent-Determined virtual/perl-MIME-Base64 dev-perl/MIME-Types >=dev-perl/Moose-0.850.0 >=dev-perl/MooseX-StrictConstructor-0.160.0 >=dev-perl/MooseX-Types-DateTime-MoreCoercions-0.70.0 dev-perl/Path-Class dev-perl/Regexp-Common dev-perl/Term-Encoding dev-perl/Term-ProgressBar-Simple dev-perl/URI dev-perl/VM-EC2-Security-CredentialCache dev-perl/XML-LibXML dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCONOVER/Net-Amazon-S3-0.80.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ce1fcc19472b76ba92dbcd3eb352f7bb
+_md5_=1107f1819b6928213580fa25e74ae3e1
diff --git a/metadata/md5-cache/dev-perl/Net-Bonjour-0.960.0 b/metadata/md5-cache/dev-perl/Net-Bonjour-0.960.0
index f4d7f0ff9c01..ecca44725411 100644
--- a/metadata/md5-cache/dev-perl/Net-Bonjour-0.960.0
+++ b/metadata/md5-cache/dev-perl/Net-Bonjour-0.960.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-DNS-0.500.0 >=virtual/perl-Socket-1.750.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHLIGE/Net-Bonjour-0.96.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b687b996d2da76424446d1fbda712ada
+_md5_=afc19285350db5b4450e011dda10985b
diff --git a/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0-r1 b/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0-r1
index 5cea5a155465..07791c26b444 100644
--- a/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-CIDR-Lite-0.210.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-0.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=beafbd965c6083900efdb8e463f9e918
+_md5_=f091d819c6cb09263274713ae1b8b108
diff --git a/metadata/md5-cache/dev-perl/Net-CUPS-0.630.0 b/metadata/md5-cache/dev-perl/Net-CUPS-0.630.0
index 8ba2ccc8e61e..65043a4fb025 100644
--- a/metadata/md5-cache/dev-perl/Net-CUPS-0.630.0
+++ b/metadata/md5-cache/dev-perl/Net-CUPS-0.630.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-print/cups net-print/cups-filters dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NINE/Net-CUPS-0.63.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a271d1bec2d70781ab1eff68e5ec2bac
+_md5_=ad86f60c62176ef39467e10efdfc11a4
diff --git a/metadata/md5-cache/dev-perl/Net-CUPS-0.640.0 b/metadata/md5-cache/dev-perl/Net-CUPS-0.640.0
index 77b5d2827378..403e516027f7 100644
--- a/metadata/md5-cache/dev-perl/Net-CUPS-0.640.0
+++ b/metadata/md5-cache/dev-perl/Net-CUPS-0.640.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-print/cups net-print/cups-filters dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NINE/Net-CUPS-0.64.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=40c5f84f481b82e0924a6360c215f4f3
+_md5_=c239e37decf1bf85b759cb334b168fce
diff --git a/metadata/md5-cache/dev-perl/Net-DBus-1.1.0 b/metadata/md5-cache/dev-perl/Net-DBus-1.1.0
index b84d54b09220..1eef2dca894b 100644
--- a/metadata/md5-cache/dev-perl/Net-DBus-1.1.0
+++ b/metadata/md5-cache/dev-perl/Net-DBus-1.1.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-apps/dbus virtual/perl-Time-HiRes dev-perl/XML-Twig dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.1.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7d6269a4e71f36aeb511b76bb9a14121
+_md5_=3a12861ee7824f9937ca2e27c7be1c04
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-1.100.0 b/metadata/md5-cache/dev-perl/Net-DNS-1.100.0
index 8e52a3e8c927..6a6a8719eda4 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-1.100.0
+++ b/metadata/md5-cache/dev-perl/Net-DNS-1.100.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=!minimal? ( >=dev-perl/Net-DNS-SEC-1.10.0 )
 RDEPEND=>=dev-perl/Digest-HMAC-1.30.0 >=virtual/perl-Digest-MD5-2.130.0 >=virtual/perl-Digest-SHA-5.230.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.110.0 >=virtual/perl-Time-Local-1.190.0 ipv6? ( || ( >=virtual/perl-IO-Socket-IP-0.320.0 >=dev-perl/IO-Socket-INET6-2.510.0 ) ) !minimal? ( >=dev-perl/Digest-BubbleBabble-0.10.0 >=dev-perl/Digest-GOST-0.60.0 >=dev-perl/Net-LibIDN-0.120.0 >=virtual/perl-Scalar-List-Utils-1.250.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.10.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5c8ac6ac3089815ff2597211cf2610df
+_md5_=9a931413081601f95477ca91b24869f9
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-1.130.0 b/metadata/md5-cache/dev-perl/Net-DNS-1.130.0
index ffdf322092b9..e2dd41998827 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-1.130.0
+++ b/metadata/md5-cache/dev-perl/Net-DNS-1.130.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=!minimal? ( >=dev-perl/Net-DNS-SEC-1.10.0 )
 RDEPEND=>=dev-perl/Digest-HMAC-1.30.0 >=virtual/perl-Digest-MD5-2.130.0 >=virtual/perl-Digest-SHA-5.230.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.110.0 >=virtual/perl-Time-Local-1.190.0 ipv6? ( >=virtual/perl-IO-Socket-IP-0.380.0 ) !minimal? ( >=dev-perl/Digest-BubbleBabble-0.10.0 >=dev-perl/Net-LibIDN-0.120.0 >=dev-perl/Net-LibIDN2-1.0.0 >=virtual/perl-Scalar-List-Utils-1.250.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.13.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7049288ab6a1548684777fcd5292023c
+_md5_=4f366c00df86b14612124be88446bde2
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Mock-1.201.710.310 b/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Mock-1.201.710.310
index 8e0cf528542c..f86553b8ae91 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Mock-1.201.710.310
+++ b/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Mock-1.201.710.310
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Net-DNS dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20171031.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9c6128ea7a4cd3cd5398bfca98b402bb
+_md5_=8b62e025f4928c75518b93e0d2d4a160
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Programmable-0.9.0 b/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Programmable-0.9.0
index 130c77a6430b..91f757b756d2 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Programmable-0.9.0
+++ b/metadata/md5-cache/dev-perl/Net-DNS-Resolver-Programmable-0.9.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-DNS-0.690.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BIGPRESH/Net-DNS-Resolver-Programmable-0.009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7fc79dc471525a30bc887f5345de6a8d
+_md5_=a2475ef3db70149d09bbce2dfdbbf8f5
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.20.0 b/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.20.0
index f5d7a53f15e6..37bd5ccca158 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.20.0
+++ b/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.20.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-perl/Crypt-OpenSSL-Bignum-0.40.0 >=dev-perl/Crypt-OpenSSL-DSA-0.140.0 >=dev-perl/Crypt-OpenSSL-RSA-0.270.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.110.0 >=dev-perl/Net-DNS-1.10.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-SEC-1.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=27787205c8be5027fb132b23a72459eb
+_md5_=f0ad62a20c56ef1b77760f96a9edec28
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.30.0 b/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.30.0
index c18679f81a38..85ed30778c2f 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.30.0
+++ b/metadata/md5-cache/dev-perl/Net-DNS-SEC-1.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-perl/Crypt-OpenSSL-Bignum-0.50.0 >=dev-perl/Crypt-OpenSSL-RSA-0.280.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.110.0 >=dev-perl/Net-DNS-1.10.0 >=virtual/perl-Digest-SHA-5.230.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-SEC-1.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e0da8c78018321e2a6f4592ac94d9b0d
+_md5_=53ebf7a17f2bf50c022f0a01fa40525f
diff --git a/metadata/md5-cache/dev-perl/Net-FreeDB-0.100.0 b/metadata/md5-cache/dev-perl/Net-FreeDB-0.100.0
index 7da5747b7953..e74464062737 100644
--- a/metadata/md5-cache/dev-perl/Net-FreeDB-0.100.0
+++ b/metadata/md5-cache/dev-perl/Net-FreeDB-0.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CDDB-File-1.10.0 >=virtual/perl-File-Temp-0.50.0 virtual/perl-IO dev-perl/Moo >=virtual/perl-libnet-2.120.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSHULTZ/Net-FreeDB-0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9b776b63c3036e545d00ac1b99b0ace7
+_md5_=6d2fad1ae6f005d6cffc96356ea309ae
diff --git a/metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r1 b/metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r1
index fcd9aea652f4..68f4027e63c2 100644
--- a/metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-perl/URI >=virtual/perl-Math-BigInt-1.87 virtual/perl-DB_File || ( virtual/perl-Math-BigInt-FastCalc dev-perl/Math-BigInt-GMP ) dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBORN/Net-Google-SafeBrowsing-Blocklist-1.04.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=16d10873e51c0c6358e158bb2d45892e
+_md5_=52d233b617bbd58e2863b9450cd48ad9
diff --git a/metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r2 b/metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r2
index eb0177184e58..2d2b3c996ca2 100644
--- a/metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-perl/URI >=virtual/perl-Math-BigInt-1.87 virtual/perl-DB_File || ( virtual/perl-Math-BigInt-FastCalc dev-perl/Math-BigInt-GMP ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBORN/Net-Google-SafeBrowsing-Blocklist-1.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=54417531493b233d84614af4252540ba
+_md5_=56daafe3fbb853b3de5dfb32c82749ea
diff --git a/metadata/md5-cache/dev-perl/Net-HTTP-6.170.0 b/metadata/md5-cache/dev-perl/Net-HTTP-6.170.0
index f5258f23c35b..6faa910585c2 100644
--- a/metadata/md5-cache/dev-perl/Net-HTTP-6.170.0
+++ b/metadata/md5-cache/dev-perl/Net-HTTP-6.170.0
@@ -7,7 +7,8 @@ IUSE=minimal test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( virtual/perl-IO-Socket-IP dev-perl/IO-Socket-INET6 >=dev-perl/IO-Socket-SSL-2.12.0 ) virtual/perl-Carp !<dev-perl/libwww-perl-6 virtual/perl-Compress-Raw-Zlib virtual/perl-IO virtual/perl-IO-Compress dev-perl/URI dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1e03e1dd377e3c3ce43cb7325bbd2bb2
+_md5_=0461c230ca2f03a29120ebad9b7f5fea
diff --git a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0 b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0
index 28ecea121d25..eaacc9e19887 100644
--- a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0
+++ b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Unicode-Normalize dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.400.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=eee462237049c4f1c77fe548f3d26949
+_md5_=439000a6a93b8236779700f99ac16265
diff --git a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.500.0 b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.500.0
index 9d4c7c26a488..58708def77b9 100644
--- a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.500.0
+++ b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.500.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Unicode-Normalize dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.500.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=70090bdd83be578606a961a4b9b66c1d
+_md5_=fc0b6a877afa951f0d75abd1a9985baf
diff --git a/metadata/md5-cache/dev-perl/Net-Ident-1.240.0-r1 b/metadata/md5-cache/dev-perl/Net-Ident-1.240.0-r1
index a8162266cbdd..d771bffa2549 100644
--- a/metadata/md5-cache/dev-perl/Net-Ident-1.240.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Ident-1.240.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Socket dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Net-Ident-1.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8acd2205b78e9d135ad5b351a9b98f1f
+_md5_=ec141d8bcd168bf61135b12174ac877b
diff --git a/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0-r1 b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0-r1
index 8dc3024ed0ba..65bc4ce39e8e 100644
--- a/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-dns/libidn2:= dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN2-1.00.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3c180b4409017f1e4b635f5c96d48f08
+_md5_=80b760522f9a6d4c730dea272144ab0f
diff --git a/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1 b/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
index 20fd4bba7c25..183cfc4cee0c 100644
--- a/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Accessor-0.31 >=dev-perl/Class-Data-Inheritable-0.06 dev-perl/Digest-HMAC dev-perl/URI virtual/perl-Digest-SHA >=virtual/perl-Encode-2.35 dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a31ec944e35ae681ea86d04e315a725b
+_md5_=779bac956e6fac4456c58be859a3e8b1
diff --git a/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0 b/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0
index 8ec3ac360aca..ddd83d0331f2 100644
--- a/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0
+++ b/metadata/md5-cache/dev-perl/Net-OpenID-Common-1.200.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Crypt-DH-GMP-0.0.110 virtual/perl-Encode >=dev-perl/HTML-Parser-3.400.0 >=dev-perl/HTTP-Message-5.814.0 virtual/perl-MIME-Base64 virtual/perl-Math-BigInt virtual/perl-Time-Local dev-perl/XML-Simple !<dev-perl/Net-OpenID-Consumer-1.30.99 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Common-1.20.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b168dbc0d0e7afb6e763092b4eeba306
+_md5_=afac89ffc91ca82bd114e8aca590ae08
diff --git a/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0 b/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0
index 37467182a2d8..1e0b23784155 100644
--- a/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0
+++ b/metadata/md5-cache/dev-perl/Net-OpenID-Consumer-1.180.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-SHA dev-perl/HTTP-Message dev-perl/JSON dev-perl/libwww-perl virtual/perl-MIME-Base64 >=dev-perl/Net-OpenID-Common-1.190.0 virtual/perl-Storable virtual/perl-Time-Local dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Consumer-1.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=15f5d1aa2b653348a76673f5d0fbfca0
+_md5_=dc4b90f429826d9556753e0cece37b83
diff --git a/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.810.0 b/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.810.0
index 4fe7dc7d905b..26205a64e0f2 100644
--- a/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.810.0
+++ b/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.810.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ~hppa ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/ssh dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.81.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cf51ac29589a65fe2ca30c822ee58543
+_md5_=8a9b10d926798e56c1020ba4d939f40b
diff --git a/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.870.0 b/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.870.0
index f2c84f5d890c..d3a26c978008 100644
--- a/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.870.0
+++ b/metadata/md5-cache/dev-perl/Net-SFTP-Foreign-1.870.0
@@ -7,7 +7,8 @@ IUSE=test examples examples
 KEYWORDS=amd64 ~hppa ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/ssh dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.87.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=06361a43850be03fcda222e746256bc4
+_md5_=0f6c1e4a5575f4a6913b6310256747c8
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.30.0 b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.30.0
index a4bb9a6828d9..145d7eef53f3 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.30.0
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-libnet dev-perl/IO-Socket-SSL dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=23b609a1ae4dca58816b1ae0a25a8d24
+_md5_=7bd5be2a02e68daa9fde8e6a0695decd
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0 b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0
index f3cd6fda9e29..b6a36c285162 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-SSL-1.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-libnet dev-perl/IO-Socket-SSL dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=aa9190b2cdb5c8af897d735918e28295
+_md5_=2c251fb9364ee0c667d2652a35d8d55c
diff --git a/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r2 b/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r2
index 2c76c41b5ca1..5e3180d06e88 100644
--- a/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r2
+++ b/metadata/md5-cache/dev-perl/Net-SNMP-6.0.1-r2
@@ -7,7 +7,8 @@ IUSE=examples test minimal
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/Crypt-DES-2.30.0 >=dev-perl/Crypt-Rijndael-1.20.0 >=dev-perl/Digest-HMAC-1.0 >=virtual/perl-Digest-MD5-2.110.0 >=dev-perl/Digest-SHA1-1.20.0 >=dev-perl/Socket6-0.230.0 ) virtual/perl-Carp virtual/perl-Exporter virtual/perl-IO virtual/perl-Math-BigInt dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DT/DTOWN/Net-SNMP-v6.0.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=25fa9d43d2a963eef1b0749606554c25
+_md5_=b72bfbf4aaaf5b1b066aefc71e1ca33b
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0 b/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0
index e8e65a84f283..04308950d9b1 100644
--- a/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0
+++ b/metadata/md5-cache/dev-perl/Net-SSH-Any-0.100.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~hppa ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-SSH-Any-0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=02d23d91df913fb4d909cd7df7bfb1be
+_md5_=2d68ddc76d3e28c52086f432bc13db75
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0 b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0
index fc028581bfc9..63d477548011 100644
--- a/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0
+++ b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Log-Log4perl-1.0.0 virtual/perl-Text-ParseWords dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/Net-SSH-AuthorizedKeysFile-0.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7326047eacf5c280b26d61cf5112b5ea
+_md5_=2493efaf9d1610d8af7ad24386e77d79
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0 b/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0
index 6561817f1b92..5fc2c056b9d6 100644
--- a/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0
+++ b/metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0
@@ -7,7 +7,8 @@ IUSE=minimal test examples
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Crypt-Curve25519-0.50.0 dev-perl/Crypt-IDEA >=dev-perl/CryptX-0.32.0 virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Math-GMP-1.40.0 virtual/perl-Scalar-List-Utils >=dev-perl/String-CRC32-1.200.0 !minimal? ( dev-perl/Digest-BubbleBabble dev-perl/Crypt-RSA dev-perl/TermReadKey ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-2.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0cb2b2e05a879019a4d1c7db5995d9ca
+_md5_=5fdd726bcb8a57017cc42fb726a62707
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.820.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.820.0
index f2fff8789837..898f9d80ef07 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.820.0
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.820.0
@@ -7,7 +7,8 @@ IUSE=libressl test minimal examples examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=openssl
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.82.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=21c71e867b84c61f4fc4089c34f8a7f1
+_md5_=6c421dcc99cc14b95f13faa59dec94c1
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.880.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.880.0
index 17502ceadb89..5177bbfd0397 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.880.0
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.880.0
@@ -7,7 +7,8 @@ IUSE=libressl test minimal examples examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9a8152c59fb96fd85d8d95eb76a600ca
+_md5_=10c2e5f189ab32253012d68997f06c41
diff --git a/metadata/md5-cache/dev-perl/Net-Server-Mail-0.230.0 b/metadata/md5-cache/dev-perl/Net-Server-Mail-0.230.0
index a82d6f570522..7b1b5a918b95 100644
--- a/metadata/md5-cache/dev-perl/Net-Server-Mail-0.230.0
+++ b/metadata/md5-cache/dev-perl/Net-Server-Mail-0.230.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+ Artistic-2
 RDEPEND=>=dev-perl/IO-Socket-SSL-1.831.0 virtual/perl-libnet dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUIMARD/Net-Server-Mail-0.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7e554a022a4468d1b712454bcf75aa6d
+_md5_=be8a6328ec53899db9f7e89dc7bfdbde
diff --git a/metadata/md5-cache/dev-perl/Net-Server-Mail-0.280.0 b/metadata/md5-cache/dev-perl/Net-Server-Mail-0.280.0
index b361a3ef1bd4..c94b920bfc5f 100644
--- a/metadata/md5-cache/dev-perl/Net-Server-Mail-0.280.0
+++ b/metadata/md5-cache/dev-perl/Net-Server-Mail-0.280.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1+ Artistic-2
 RDEPEND=>=dev-perl/IO-Socket-SSL-1.831.0 virtual/perl-libnet dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUIMARD/Net-Server-Mail-0.28.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d294f1aa5ce92338692d84cb111299b0
+_md5_=61aac8ec0e34eddce9b2adc54182ab60
diff --git a/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.110.0 b/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.110.0
index 785885b23303..ba740ff8e811 100644
--- a/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.110.0
+++ b/metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ia64 ~mips ~ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-Telnet-3.20.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VINSWORLD/Net-Telnet-Cisco-1.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=14012c89d02bda8193f11c4e31c7aaa4
+_md5_=894988a029eb7e35b5cf7a795ab5be07
diff --git a/metadata/md5-cache/dev-perl/Net-Twitter-4.10.420 b/metadata/md5-cache/dev-perl/Net-Twitter-4.10.420
index 7f53f78faaf7..fe1a79e0f906 100644
--- a/metadata/md5-cache/dev-perl/Net-Twitter-4.10.420
+++ b/metadata/md5-cache/dev-perl/Net-Twitter-4.10.420
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Carp-Clan dev-perl/Class-Load dev-perl/Data-Visitor >=dev-perl/DateTime-0.51 dev-perl/DateTime-Format-Strptime >=dev-perl/Devel-StackTrace-1.21 virtual/perl-Digest-SHA virtual/perl-Encode dev-perl/HTML-Parser dev-perl/HTTP-Message >=dev-perl/IO-Socket-SSL-2.5.0 dev-perl/JSON-MaybeXS dev-perl/LWP-Protocol-https virtual/perl-Scalar-List-Utils >=dev-perl/Moose-0.940.0 dev-perl/MooseX-Role-Parameterized dev-perl/Net-HTTP !=dev-perl/Net-HTTP-6.40.0 !=dev-perl/Net-HTTP-6.50.0 virtual/perl-libnet >=dev-perl/Net-OAuth-0.25 virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.30.0 >=dev-perl/URI-1.400.0 virtual/perl-libnet dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-4.01042.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2b6b294af1491e9d427100ab98a5666d
+_md5_=11f4f295eefa9f2f294cf397e5e9ad0b
diff --git a/metadata/md5-cache/dev-perl/Net-UPnP-1.4.3 b/metadata/md5-cache/dev-perl/Net-UPnP-1.4.3
index cc8d9ab3b341..ccc5ac6f50c3 100644
--- a/metadata/md5-cache/dev-perl/Net-UPnP-1.4.3
+++ b/metadata/md5-cache/dev-perl/Net-UPnP-1.4.3
@@ -7,7 +7,8 @@ IUSE=examples test
 KEYWORDS=amd64 ppc x86 ~x86-solaris
 LICENSE=BSD
 RDEPEND=virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SK/SKONNO/Net-UPnP-1.4.3.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=571935a3c94ba256ff9ffa3a54c8a5ca
+_md5_=be068e2c8f4cccc7379e1c2c81f2f307
diff --git a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0 b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
index d51e2f244d0c..966eeb5558e0 100644
--- a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
+++ b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-perl/Authen-SASL-2.120.0 virtual/perl-Digest-SHA virtual/perl-Scalar-List-Utils >=dev-perl/XML-Stream-1.240.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAPATRICK/Net-XMPP-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6e94bde158a2361068bc4899ee62a401
+_md5_=5aa594883505a29f55a57bbf7c737a43
diff --git a/metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0 b/metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0
index b9e5841a2ffc..60ffa0ea0e60 100644
--- a/metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0
+++ b/metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0
@@ -7,7 +7,8 @@ IUSE=ipv6 test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=ipv6? ( dev-perl/Socket6 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.079.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=01326756461507699e33afd563ac1085
+_md5_=3d72d122eb8f1984f99814b4ce0f1045
diff --git a/metadata/md5-cache/dev-perl/NetPacket-1.6.0 b/metadata/md5-cache/dev-perl/NetPacket-1.6.0
index dd8d5d7add45..dd31273da8bc 100644
--- a/metadata/md5-cache/dev-perl/NetPacket-1.6.0
+++ b/metadata/md5-cache/dev-perl/NetPacket-1.6.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/NetPacket-1.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6f336d5a61554c632bade1bb0aa23e9b
+_md5_=686d80a4528868a092d032bc66aff111
diff --git a/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0 b/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0
index fcd1f7aa518d..3b345bd8319e 100644
--- a/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0
+++ b/metadata/md5-cache/dev-perl/Number-Bytes-Human-0.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Number-Bytes-Human-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f59cdc3d13537daa0007051bb29b4f94
+_md5_=1780d528431f4011ac3d4c28f3cb3420
diff --git a/metadata/md5-cache/dev-perl/Number-Fraction-2.0.0 b/metadata/md5-cache/dev-perl/Number-Fraction-2.0.0
index 89bebb3dd28c..375a788f63da 100644
--- a/metadata/md5-cache/dev-perl/Number-Fraction-2.0.0
+++ b/metadata/md5-cache/dev-perl/Number-Fraction-2.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-2.00.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=765825415b2a6877ae611f0a6ca87a45
+_md5_=85198c30c74b31179c6dd6ea3bf15306
diff --git a/metadata/md5-cache/dev-perl/Number-WithError-1.10.0 b/metadata/md5-cache/dev-perl/Number-WithError-1.10.0
index ebf5e32a4134..170454ea3496 100644
--- a/metadata/md5-cache/dev-perl/Number-WithError-1.10.0
+++ b/metadata/md5-cache/dev-perl/Number-WithError-1.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.400.0 >=dev-perl/Params-Util-0.100.0 >=dev-perl/prefork-1.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Number-WithError-1.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6a8877d0df7507fbc9b9a9c88f21726a
+_md5_=37f4587283d6fb43752dab594b6e69b4
diff --git a/metadata/md5-cache/dev-perl/OOTools-2.400.0 b/metadata/md5-cache/dev-perl/OOTools-2.400.0
index 1e677e917625..242edae1ac85 100644
--- a/metadata/md5-cache/dev-perl/OOTools-2.400.0
+++ b/metadata/md5-cache/dev-perl/OOTools-2.400.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SK/SKNPP/OOTools-2.4.tar.gz https://dev.gentoo.org/~tove/distfiles/dev-perl/OOTools/OOTools-2.300.0-patch.tar.bz2
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=97d00ff8c36aa6f60f644d3ceebb496f
+_md5_=c607d37fcd351dd1baaff6b822156aca
diff --git a/metadata/md5-cache/dev-perl/ORLite-1.980.0-r1 b/metadata/md5-cache/dev-perl/ORLite-1.980.0-r1
index 77ca59ab5652..5cd476b6b51e 100644
--- a/metadata/md5-cache/dev-perl/ORLite-1.980.0-r1
+++ b/metadata/md5-cache/dev-perl/ORLite-1.980.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Path-2.08 >=virtual/perl-File-Temp-0.20 >=dev-perl/Params-Util-1 >=dev-perl/DBI-1.607 >=dev-perl/DBD-SQLite-1.27 >=dev-perl/File-Remove-1.40 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/ORLite-1.98.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1048e8b758934de2414c86b5cef33416
+_md5_=a4dedbc0a07dbe6dc47d3b973639f23c
diff --git a/metadata/md5-cache/dev-perl/Object-Enum-0.75.0 b/metadata/md5-cache/dev-perl/Object-Enum-0.75.0
index 662e092d78a6..207f518b7cac 100644
--- a/metadata/md5-cache/dev-perl/Object-Enum-0.75.0
+++ b/metadata/md5-cache/dev-perl/Object-Enum-0.75.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Sub-Install dev-perl/Sub-Exporter dev-perl/Class-Data-Inheritable dev-perl/Class-Accessor dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMMILLS/Object-Enum-0.075.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d5e71f0889f2f5bc94b0558593c2d286
+_md5_=e04596f83b6c893c36dc844fceaa21f0
diff --git a/metadata/md5-cache/dev-perl/Object-Event-1.230.0 b/metadata/md5-cache/dev-perl/Object-Event-1.230.0
index 1e9bd336c19a..26271fa7a232 100644
--- a/metadata/md5-cache/dev-perl/Object-Event-1.230.0
+++ b/metadata/md5-cache/dev-perl/Object-Event-1.230.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/AnyEvent-3.500.0 dev-perl/common-sense dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EL/ELMEX/Object-Event-1.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a0e7b121dc4da6507087554c3aee658f
+_md5_=2f70c97857a28838c9120dbee0e69b11
diff --git a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0 b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
index cfc127687536..134d38192e8b 100644
--- a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
+++ b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.19.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0d7bbbadbeb7250112dadf78f8b6a838
+_md5_=9d66a3076ac2406f900cbb42c04037ff
diff --git a/metadata/md5-cache/dev-perl/Olson-Abbreviations-0.40.0 b/metadata/md5-cache/dev-perl/Olson-Abbreviations-0.40.0
index fc0160d2f5a3..0aa295eb058b 100644
--- a/metadata/md5-cache/dev-perl/Olson-Abbreviations-0.40.0
+++ b/metadata/md5-cache/dev-perl/Olson-Abbreviations-0.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose >=dev-perl/MooseX-ClassAttribute-0.250.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EC/ECARROLL/Olson-Abbreviations-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f55d6350f02f9c4928785c0fa014f9ef
+_md5_=fae1200287ae25ce1fe3f38fdc758749
diff --git a/metadata/md5-cache/dev-perl/PAR-1.15.0 b/metadata/md5-cache/dev-perl/PAR-1.15.0
index 846b2ddf56d7..d284ea9a670b 100644
--- a/metadata/md5-cache/dev-perl/PAR-1.15.0
+++ b/metadata/md5-cache/dev-perl/PAR-1.15.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Archive-Zip-1.00 >=virtual/perl-AutoLoader-5.660.200 >=virtual/perl-Digest-SHA-5.450.0 >=virtual/perl-File-Temp-0.50.0 >=virtual/perl-IO-Compress-1.300.0 >=dev-perl/PAR-Dist-0.320.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-1.015.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=864c844bebc56cfd06baf738bbd57a1a
+_md5_=a43f2e0a82ab648221db21a1571ad4d8
diff --git a/metadata/md5-cache/dev-perl/PBKDF2-Tiny-0.5.0-r1 b/metadata/md5-cache/dev-perl/PBKDF2-Tiny-0.5.0-r1
index b492217ed3e4..15f1d4614236 100644
--- a/metadata/md5-cache/dev-perl/PBKDF2-Tiny-0.5.0-r1
+++ b/metadata/md5-cache/dev-perl/PBKDF2-Tiny-0.5.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/PBKDF2-Tiny-0.005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2ba923645740e4351188abc59668970e
+_md5_=e569379c6a25d047e0ca8162b7f85a83
diff --git a/metadata/md5-cache/dev-perl/PDF-API2-2.33.0 b/metadata/md5-cache/dev-perl/PDF-API2-2.33.0
index f1840b65c1a8..7941a771bcbe 100644
--- a/metadata/md5-cache/dev-perl/PDF-API2-2.33.0
+++ b/metadata/md5-cache/dev-perl/PDF-API2-2.33.0
@@ -7,7 +7,8 @@ IUSE=examples test examples
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/perl-IO-Compress-1.0.0 dev-perl/Font-TTF dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.033.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9450362f3c539e585bddd45e52a19ab7
+_md5_=7776d4813c96818627ebda77bc7042b8
diff --git a/metadata/md5-cache/dev-perl/PDF-Create-1.430.0 b/metadata/md5-cache/dev-perl/PDF-Create-1.430.0
index db0793f5c9b9..62e8ff4e31c6 100644
--- a/metadata/md5-cache/dev-perl/PDF-Create-1.430.0
+++ b/metadata/md5-cache/dev-perl/PDF-Create-1.430.0
@@ -7,7 +7,8 @@ IUSE=test examples examples
 KEYWORDS=alpha amd64 ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper >=dev-perl/File-Share-0.250.0 dev-perl/JSON virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/PDF-Create-1.43.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9b72f7349cc71cc7dfc7e2f715baed30
+_md5_=00346590b3ac5ef6ec63d40fd24d9d48
diff --git a/metadata/md5-cache/dev-perl/PDL-2.17.0 b/metadata/md5-cache/dev-perl/PDL-2.17.0
index a32ee0c26a32..0ab5abee16ad 100644
--- a/metadata/md5-cache/dev-perl/PDL-2.17.0
+++ b/metadata/md5-cache/dev-perl/PDL-2.17.0
@@ -7,7 +7,8 @@ IUSE=+badval doc fortran gd gsl hdf netpbm pdl2 pgplot threads test
 KEYWORDS=amd64 arm ppc x86
 LICENSE=|| ( Artistic GPL-1+ ) public-domain PerlDL
 RDEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-perl/File-Map >=dev-perl/Inline-0.680.0 >=dev-perl/Inline-C-0.620.0 dev-perl/Module-Compile dev-perl/OpenGL dev-perl/TermReadKey || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) >=virtual/perl-Data-Dumper-2.121.0 virtual/perl-Pod-Parser virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Filter-Simple dev-perl/Filter virtual/perl-Storable >=virtual/perl-Text-Balanced-1.890.0 gd? ( media-libs/gd ) gsl? ( sci-libs/gsl ) hdf? ( sci-libs/hdf ) netpbm? ( media-libs/netpbm virtual/ffmpeg ) pdl2? ( >=dev-perl/Devel-REPL-1.3.11 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) ) pgplot? ( dev-perl/PGPLOT ) dev-lang/perl:= fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHM/PDL-2.017.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=62ef15646b98d8106032f0f7567477eb
+_md5_=6dd84da514da8676e615859839088f1f
diff --git a/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.11.0-r1 b/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.11.0-r1
index 36c358f1e025..30221da3acfb 100644
--- a/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.11.0-r1
+++ b/metadata/md5-cache/dev-perl/PDL-Graphics-Gnuplot-2.11.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Alien-Gnuplot virtual/perl-IO dev-perl/IPC-Run virtual/perl-Scalar-List-Utils dev-perl/PDL dev-perl/PDL-Transform-Color dev-perl/Safe-Isa virtual/perl-Storable virtual/perl-Time-HiRes || ( sci-visualization/gnuplot[X] sci-visualization/gnuplot[qt4] ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZO/ZOWIE/PDL-Graphics-Gnuplot-2.011.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2ef52976efa64cd65ee153c32add84c2
+_md5_=22626d1cb42480685df15fd6a363567b
diff --git a/metadata/md5-cache/dev-perl/POE-1.367 b/metadata/md5-cache/dev-perl/POE-1.367
index c9910985a7e2..bd0e2448b35d 100644
--- a/metadata/md5-cache/dev-perl/POE-1.367
+++ b/metadata/md5-cache/dev-perl/POE-1.367
@@ -7,7 +7,8 @@ IUSE=ipv6 libwww ncurses tk test
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/YAML dev-perl/Filter dev-perl/IO-Pipely dev-perl/FreezeThaw >=dev-perl/Event-1.09 >=virtual/perl-File-Spec-0.87 >=virtual/perl-IO-1.23.01 >=virtual/perl-IO-Compress-1.33 >=virtual/perl-Storable-2.12 >=dev-perl/IO-Tty-1.08 >=dev-perl/TermReadKey-2.21 >=virtual/perl-Time-HiRes-1.59 ipv6? ( >=dev-perl/Socket6-0.14 ) tk? ( >=dev-perl/Tk-800.027 ) libwww? ( >=dev-perl/libwww-perl-5.79 >=dev-perl/URI-1.30 ) ncurses? ( >=dev-perl/Curses-1.08 ) dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-1.367.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e75b645371f792a4afc3c933cac8c9c2
+_md5_=95c2311ca88fbc51fc3524ee6ed3f466
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Client-DNS-1.54.0 b/metadata/md5-cache/dev-perl/POE-Component-Client-DNS-1.54.0
index ba283144d57a..cb20093bdc02 100644
--- a/metadata/md5-cache/dev-perl/POE-Component-Client-DNS-1.54.0
+++ b/metadata/md5-cache/dev-perl/POE-Component-Client-DNS-1.54.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-DNS-0.650.0 >=dev-perl/POE-1.294.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Client-DNS-1.054.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=973d12cbe161855026471233d270f11e
+_md5_=2b09be55fd43afcfc350237468e5c382
diff --git a/metadata/md5-cache/dev-perl/POE-Component-IKC-0.240.200 b/metadata/md5-cache/dev-perl/POE-Component-IKC-0.240.200
index 3e384d50ef1c..f40e1635d644 100644
--- a/metadata/md5-cache/dev-perl/POE-Component-IKC-0.240.200
+++ b/metadata/md5-cache/dev-perl/POE-Component-IKC-0.240.200
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Data-Dump-1.0.0 >=dev-perl/Devel-Size-0.770.0 >=dev-perl/POE-1.311.0 >=virtual/perl-Scalar-List-Utils-1.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GW/GWYN/POE-Component-IKC-0.2402.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b12c8add28bd4f37b757c76c21a59776
+_md5_=1b50ea8e2b1be0a3d798c7f05ff04c7b
diff --git a/metadata/md5-cache/dev-perl/POSIX-strftime-Compiler-0.420.0 b/metadata/md5-cache/dev-perl/POSIX-strftime-Compiler-0.420.0
index 99d9e505c841..f05a4dc935aa 100644
--- a/metadata/md5-cache/dev-perl/POSIX-strftime-Compiler-0.420.0
+++ b/metadata/md5-cache/dev-perl/POSIX-strftime-Compiler-0.420.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Time-TZOffset ) virtual/perl-Carp virtual/perl-Exporter virtual/perl-Time-Local dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/POSIX-strftime-Compiler-0.42.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6962e5d65aa388f4cc7db6c73e88d05b
+_md5_=44efcbc5a28d6bbd01899fde47dc5c1b
diff --git a/metadata/md5-cache/dev-perl/PPI-1.224.0 b/metadata/md5-cache/dev-perl/PPI-1.224.0
index bf637e9f9760..a7e04f486481 100644
--- a/metadata/md5-cache/dev-perl/PPI-1.224.0
+++ b/metadata/md5-cache/dev-perl/PPI-1.224.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Clone-0.300.0 >=virtual/perl-Digest-MD5-2.350.0 >=virtual/perl-File-Spec-3.270.100 >=dev-perl/IO-String-1.70.0 >=dev-perl/List-MoreUtils-0.160.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Params-Util-1.000.0 >=virtual/perl-Storable-2.170.0 dev-perl/Task-Weaken dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.224.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=79062aba35cb3f29fbf3c8f546c102ee
+_md5_=9a9d5af604b375fee09ebf2757c31915
diff --git a/metadata/md5-cache/dev-perl/PPI-1.236.0 b/metadata/md5-cache/dev-perl/PPI-1.236.0
index 5e57fbee8e8e..4c447fdd3619 100644
--- a/metadata/md5-cache/dev-perl/PPI-1.236.0
+++ b/metadata/md5-cache/dev-perl/PPI-1.236.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Clone-0.300.0 >=virtual/perl-Digest-MD5-2.350.0 >=virtual/perl-File-Spec-3.270.100 >=dev-perl/IO-String-1.70.0 >=dev-perl/List-MoreUtils-0.160.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Params-Util-1.000.0 >=virtual/perl-Storable-2.170.0 dev-perl/Task-Weaken dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.236.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=99b7e9a83ce71cd751e16de555b559a5
+_md5_=9cfebff9d6b98f0ebbc7b27e84ff50eb
diff --git a/metadata/md5-cache/dev-perl/PPI-HTML-1.80.0 b/metadata/md5-cache/dev-perl/PPI-HTML-1.80.0
index 9f45cf03d1bb..df1df907a89b 100644
--- a/metadata/md5-cache/dev-perl/PPI-HTML-1.80.0
+++ b/metadata/md5-cache/dev-perl/PPI-HTML-1.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CSS-Tiny-1.100.0 >=dev-perl/PPI-0.990.0 >=dev-perl/Params-Util-0.50.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/PPI-HTML-1.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=96e78821fab7f485f3a00aa65a1e56e8
+_md5_=6576a6023ff2ae5a4d37c4572677f056
diff --git a/metadata/md5-cache/dev-perl/PPIx-EditorTools-0.200.0 b/metadata/md5-cache/dev-perl/PPIx-EditorTools-0.200.0
index d7cd2ad27b4e..140f3a4c5d21 100644
--- a/metadata/md5-cache/dev-perl/PPIx-EditorTools-0.200.0
+++ b/metadata/md5-cache/dev-perl/PPIx-EditorTools-0.200.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Class-XSAccessor-1.20.0 virtual/perl-File-Spec >=dev-perl/PPI-1.215.0 dev-perl/Try-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/PPIx-EditorTools-0.20.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4e35f6ab824429a01406bf7db0e3773e
+_md5_=c20e7fbeb1cc75dcecdb1fc365fbd72c
diff --git a/metadata/md5-cache/dev-perl/PPIx-Regexp-0.53.0 b/metadata/md5-cache/dev-perl/PPIx-Regexp-0.53.0
index b884eb4ca8f5..261bb559afd7 100644
--- a/metadata/md5-cache/dev-perl/PPIx-Regexp-0.53.0
+++ b/metadata/md5-cache/dev-perl/PPIx-Regexp-0.53.0
@@ -7,7 +7,8 @@ IUSE=test examples examples
 KEYWORDS=alpha amd64 ppc ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/List-MoreUtils >=dev-perl/PPI-1.117.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.053.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=82553c62891023feaa4e0165a5e179f6
+_md5_=77d6d376711000a7e02ce9d1d1faecf6
diff --git a/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1 b/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
index ab56139a72c9..8ec0470c40de 100644
--- a/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
+++ b/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/PPI-1.208 dev-perl/Exception-Class dev-perl/Readonly virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9fb80cafb27fdf1cf1e5db9c4264e51b
+_md5_=cbb96b4ca7608faee00230e5c7e33af0
diff --git a/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.150.0 b/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.150.0
index 43cced8ae3ff..32f59d2546a1 100644
--- a/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.150.0
+++ b/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.150.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Package-Stash dev-perl/Params-Util dev-perl/Sub-Install dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f44a15375adbff53b5c8497db6873d2f
+_md5_=c8ac2a97812a196211bd7afc1e51da80
diff --git a/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0 b/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0
index a6ebe2f2fa06..abc778652f35 100644
--- a/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0
+++ b/metadata/md5-cache/dev-perl/Package-DeprecationManager-0.170.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Package-Stash dev-perl/Params-Util dev-perl/Sub-Install dev-perl/Sub-Name dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5c61fb30fd9c6e2447a46405542d3f4b
+_md5_=97e78d1720e55bb828b33687cd4996d3
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-0.370.0 b/metadata/md5-cache/dev-perl/Package-Stash-0.370.0
index 64134cba3b64..b41dcba57bf7 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-0.370.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-0.370.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Getopt-Long >=dev-perl/Module-Implementation-0.60.0 virtual/perl-Scalar-List-Utils !minimal? ( >=dev-perl/Package-Stash-XS-0.260.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=70a79fa876d11182bdf0cef554882f03
+_md5_=ffba469b9fd5f4b728b7f9090d0ff3a1
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0 b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
index ef1a71480cd9..627c4dd53fd9 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9bcab776067ffd636a782d61a3ac672e
+_md5_=64993a1a199d5b233e95b2b27a504c0f
diff --git a/metadata/md5-cache/dev-perl/Package-Variant-1.3.2 b/metadata/md5-cache/dev-perl/Package-Variant-1.3.2
index da9d397289d5..3d8289d85e30 100644
--- a/metadata/md5-cache/dev-perl/Package-Variant-1.3.2
+++ b/metadata/md5-cache/dev-perl/Package-Variant-1.3.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/strictures-2.0.0 >=dev-perl/Module-Runtime-0.13.0 >=dev-perl/Import-Into-1.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTROUT/Package-Variant-1.003002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=85ac27d300472cf29ead7a45a3f5be76
+_md5_=16b34b4a7a3f9b0778a4545be4980d60
diff --git a/metadata/md5-cache/dev-perl/Palm-1.12.0-r1 b/metadata/md5-cache/dev-perl/Palm-1.12.0-r1
index 2108b4d4a1b2..f60410a84396 100644
--- a/metadata/md5-cache/dev-perl/Palm-1.12.0-r1
+++ b/metadata/md5-cache/dev-perl/Palm-1.12.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=Artistic
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/p5-Palm-1.012.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0f978af0e9f3db2bf9c2f7a0e2b35297
+_md5_=9216db135e8b243f568ddcb591cb2ec6
diff --git a/metadata/md5-cache/dev-perl/Palm-1.400.0 b/metadata/md5-cache/dev-perl/Palm-1.400.0
index db871f1cac07..6bed9e1565be 100644
--- a/metadata/md5-cache/dev-perl/Palm-1.400.0
+++ b/metadata/md5-cache/dev-perl/Palm-1.400.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-perl/Palm-PDB dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Palm-1.400.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=11989cbb2cba9e47599be7f4b6c59789
+_md5_=ddd6d7572442e0ca50742722d465fbb2
diff --git a/metadata/md5-cache/dev-perl/Palm-PDB-1.400.0 b/metadata/md5-cache/dev-perl/Palm-PDB-1.400.0
index 3e8058b507b7..76bbb37e40e0 100644
--- a/metadata/md5-cache/dev-perl/Palm-PDB-1.400.0
+++ b/metadata/md5-cache/dev-perl/Palm-PDB-1.400.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Palm-1.14.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Palm-PDB-1.400.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3126f28883cc8b4050e34990e9081aa7
+_md5_=e080f2d11d454b5cbbebd30dfcde052e
diff --git a/metadata/md5-cache/dev-perl/Pango-1.227.0 b/metadata/md5-cache/dev-perl/Pango-1.227.0
index 8042d7100cf5..ee116bda77bb 100644
--- a/metadata/md5-cache/dev-perl/Pango-1.227.0
+++ b/metadata/md5-cache/dev-perl/Pango-1.227.0
@@ -7,7 +7,8 @@ IUSE=examples test minimal
 KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-perl/glib-perl-1.220.0 >=dev-perl/Cairo-1.0.0 >=x11-libs/pango-1.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Pango-1.227.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=9d75cec9fa6f1faf6f348f655f3048dd
+_md5_=c228840d8f6b04e89abee70f47845ba1
diff --git a/metadata/md5-cache/dev-perl/Pango-1.227.0-r1 b/metadata/md5-cache/dev-perl/Pango-1.227.0-r1
index 5363f7dfada6..4b0523bff6bc 100644
--- a/metadata/md5-cache/dev-perl/Pango-1.227.0-r1
+++ b/metadata/md5-cache/dev-perl/Pango-1.227.0-r1
@@ -7,7 +7,8 @@ IUSE=examples test minimal
 KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-perl/glib-perl-1.220.0 >=dev-perl/Cairo-1.0.0 >=x11-libs/pango-1.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Pango-1.227.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=2d260eb4725ba819c1bb83f3b01416a1
+_md5_=ffaa22571b95f450add913a0593a6ce6
diff --git a/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.190.0 b/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.190.0
index 6ba818d0d9cc..b4d9f4987b0c 100644
--- a/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.190.0
+++ b/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.190.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=alpha amd64 ~arm ia64 ~ppc sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Path virtual/perl-File-Temp virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/Parallel-ForkManager-1.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4fc493138119c6eea947c14ec779c75a
+_md5_=d41c5c38071ff7019fd081d9a2559a79
diff --git a/metadata/md5-cache/dev-perl/Parallel-Iterator-1.0.0-r1 b/metadata/md5-cache/dev-perl/Parallel-Iterator-1.0.0-r1
index 87acee778541..5119b2b14915 100644
--- a/metadata/md5-cache/dev-perl/Parallel-Iterator-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Parallel-Iterator-1.0.0-r1
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/Parallel-Iterator-1.00.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=51b8dac75dbe44d10fbdd1eca398501b
+_md5_=e89fa8d1cdfed76580f7546de5c71434
diff --git a/metadata/md5-cache/dev-perl/Parallel-Prefork-0.180.0 b/metadata/md5-cache/dev-perl/Parallel-Prefork-0.180.0
index 4e4b41d5a1a8..5bbaf3792574 100644
--- a/metadata/md5-cache/dev-perl/Parallel-Prefork-0.180.0
+++ b/metadata/md5-cache/dev-perl/Parallel-Prefork-0.180.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Accessor-Lite-0.40.0 dev-perl/List-MoreUtils >=dev-perl/Proc-Wait3-0.30.0 dev-perl/Scope-Guard dev-perl/Signal-Mask dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=eddd38389c206fd0c1d49fcec68484cb
+_md5_=12736c6c548b6494d5554240b1cca4a7
diff --git a/metadata/md5-cache/dev-perl/Params-Classify-0.13.0-r1 b/metadata/md5-cache/dev-perl/Params-Classify-0.13.0-r1
index 8b0ab042ae01..49d91ffcbcce 100644
--- a/metadata/md5-cache/dev-perl/Params-Classify-0.13.0-r1
+++ b/metadata/md5-cache/dev-perl/Params-Classify-0.13.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.10.0 virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.013.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6435d224ee00256465b690b36b8bb537
+_md5_=eebabde1b9da666524961581a6bb82ed
diff --git a/metadata/md5-cache/dev-perl/Params-Classify-0.15.0 b/metadata/md5-cache/dev-perl/Params-Classify-0.15.0
index 1192d45f4052..1307249b0fdf 100644
--- a/metadata/md5-cache/dev-perl/Params-Classify-0.15.0
+++ b/metadata/md5-cache/dev-perl/Params-Classify-0.15.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Devel-CallChecker-0.3.0 virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.10.0 virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4e468771d4fc83ebf40aa713d0c10856
+_md5_=93915c66a4f626b22f36077e9c6ee0fc
diff --git a/metadata/md5-cache/dev-perl/Params-Util-1.70.0 b/metadata/md5-cache/dev-perl/Params-Util-1.70.0
index 38265defedf5..7b4fdea9268a 100644
--- a/metadata/md5-cache/dev-perl/Params-Util-1.70.0
+++ b/metadata/md5-cache/dev-perl/Params-Util-1.70.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.180.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Params-Util-1.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7c794529ed7a9310f9edbc09d8019649
+_md5_=51f8d790da9f583430f04aea27c0102e
diff --git a/metadata/md5-cache/dev-perl/Params-Validate-1.290.0 b/metadata/md5-cache/dev-perl/Params-Validate-1.290.0
index a248226c518c..a00d3955d888 100644
--- a/metadata/md5-cache/dev-perl/Params-Validate-1.290.0
+++ b/metadata/md5-cache/dev-perl/Params-Validate-1.290.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/Module-Implementation >=virtual/perl-Scalar-List-Utils-1.110.0 virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.29.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fe0a06d795fe14e98a8224909e46b95e
+_md5_=c490cb16d308c47004038c2409d65ea8
diff --git a/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.240.0 b/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.240.0
index 94631f806731..4a8abe9c6db1 100644
--- a/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.240.0
+++ b/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.240.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Eval-Closure dev-perl/Exception-Class virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.400.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b69bfb8710750c933f8433330aad9b0e
+_md5_=e0deebfbb1e1539634a4587788b496f2
diff --git a/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.260.0 b/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.260.0
index dc59145f9b66..648b7b849ac0 100644
--- a/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.260.0
+++ b/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.260.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp dev-perl/Eval-Closure dev-perl/Exception-Class virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.400.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a2ff51d7f608b38fdee96cac4017588a
+_md5_=9259c09906fff96dafc9658b9b3e1985
diff --git a/metadata/md5-cache/dev-perl/Parse-ErrorString-Perl-0.270.0 b/metadata/md5-cache/dev-perl/Parse-ErrorString-Perl-0.270.0
index 88274bd154af..f8ff15f263bb 100644
--- a/metadata/md5-cache/dev-perl/Parse-ErrorString-Perl-0.270.0
+++ b/metadata/md5-cache/dev-perl/Parse-ErrorString-Perl-0.270.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-XSAccessor virtual/perl-File-Spec virtual/perl-Pod-Parser >=dev-perl/Pod-POM-0.270.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/Parse-ErrorString-Perl-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4e7a2d1952b52bec12456f76fe0471c6
+_md5_=6e1e2398a82331777a34cdbbdff8af62
diff --git a/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15 b/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
index 9453c2850e70..c3033a5c31ef 100644
--- a/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
+++ b/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Text-Balanced-1.950.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=edbe424b553fa7b88c874b5ecaf3b4cf
+_md5_=2c7100f68bd7a333315cc27874e77cdf
diff --git a/metadata/md5-cache/dev-perl/Path-Class-0.360.0 b/metadata/md5-cache/dev-perl/Path-Class-0.360.0
index 25f854e11c16..b9f6753d4e92 100644
--- a/metadata/md5-cache/dev-perl/Path-Class-0.360.0
+++ b/metadata/md5-cache/dev-perl/Path-Class-0.360.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Path >=virtual/perl-File-Spec-3.260.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Perl-OSType virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.36.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bcf9b1a509453ce6aa70a3ffda240b17
+_md5_=4bd995dd2ac1099bd8b2c302fb4e4e88
diff --git a/metadata/md5-cache/dev-perl/Path-Class-0.370.0 b/metadata/md5-cache/dev-perl/Path-Class-0.370.0
index 9487e4466de7..70d2fd4c8b9c 100644
--- a/metadata/md5-cache/dev-perl/Path-Class-0.370.0
+++ b/metadata/md5-cache/dev-perl/Path-Class-0.370.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Path >=virtual/perl-File-Spec-3.260.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Perl-OSType virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a8f8591b96f04670a220dace4c14093b
+_md5_=4122f3f0ad0741b79ad00d63a11e43fa
diff --git a/metadata/md5-cache/dev-perl/Path-FindDev-0.5.3 b/metadata/md5-cache/dev-perl/Path-FindDev-0.5.3
index 7f1d1d6f86ab..0cc43c0be420 100644
--- a/metadata/md5-cache/dev-perl/Path-FindDev-0.5.3
+++ b/metadata/md5-cache/dev-perl/Path-FindDev-0.5.3
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Class-Tiny-0.10.0 >=dev-perl/Path-IsDev-0.2.2 >=dev-perl/Path-Tiny-0.54.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/Path-FindDev-v0.5.3.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ce4ccde203c486ddf75364fde707b9d6
+_md5_=1af680b7631541aec5d3aa543f2f4c31
diff --git a/metadata/md5-cache/dev-perl/Path-IsDev-1.1.3 b/metadata/md5-cache/dev-perl/Path-IsDev-1.1.3
index 44b65590c6f2..6be30b5b3a6d 100644
--- a/metadata/md5-cache/dev-perl/Path-IsDev-1.1.3
+++ b/metadata/md5-cache/dev-perl/Path-IsDev-1.1.3
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Class-Tiny-0.10.0 dev-perl/File-HomeDir dev-perl/Module-Runtime >=dev-perl/Path-Tiny-0.4.0 dev-perl/Role-Tiny virtual/perl-Scalar-List-Utils dev-perl/Sub-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/Path-IsDev-1.001003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e638c21d4f8391ca5710570ee35a897e
+_md5_=45eea6a9783941a623a514913f6f326b
diff --git a/metadata/md5-cache/dev-perl/Path-Tiny-0.104.0 b/metadata/md5-cache/dev-perl/Path-Tiny-0.104.0
index ca6abb52a7a1..664d01721cdf 100644
--- a/metadata/md5-cache/dev-perl/Path-Tiny-0.104.0
+++ b/metadata/md5-cache/dev-perl/Path-Tiny-0.104.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=!minimal? ( >=dev-perl/Unicode-UTF8-0.580.0 ) virtual/perl-Carp >=virtual/perl-Digest-1.30.0 >=virtual/perl-Digest-SHA-5.450.0 >=virtual/perl-Exporter-5.570.0 >=virtual/perl-File-Path-2.70.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-File-Temp-0.190.0 virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.104.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7a9d47ff2260a753aa4a7c5287d06755
+_md5_=c2db001448de9ee90c62f9511dacd867
diff --git a/metadata/md5-cache/dev-perl/Pegex-0.640.0 b/metadata/md5-cache/dev-perl/Pegex-0.640.0
index 9389350621f8..249be1e12914 100644
--- a/metadata/md5-cache/dev-perl/Pegex-0.640.0
+++ b/metadata/md5-cache/dev-perl/Pegex-0.640.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Pegex-0.64.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=eca96aede0c2ef487c234a424439d0f4
+_md5_=abe6bc7263b935537c5f99b610da8715
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0 b/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
index 36a7f10d5321..5e1880aed5a3 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples emacs
 KEYWORDS=alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.889.0 >=dev-perl/Exception-Class-1.230.0 >=virtual/perl-Exporter-5.630.0 dev-perl/File-HomeDir virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which virtual/perl-Getopt-Long dev-perl/IO-String >=dev-perl/List-MoreUtils-0.190.0 >=dev-perl/Module-Pluggable-3.100.0 >=dev-perl/PPI-1.224 >=dev-perl/PPIx-Regexp-0.27.0 >=dev-perl/PPIx-Utilities-1.1.0 virtual/perl-Pod-Parser >=dev-perl/Pod-Spell-1 >=dev-perl/Readonly-2 virtual/perl-Scalar-List-Utils >=dev-perl/String-Format-1.130.0 dev-perl/Task-Weaken >=virtual/perl-Term-ANSIColor-2.20.0 >=virtual/perl-Test-Simple-0.920.0 >=virtual/perl-Text-ParseWords-3 dev-perl/Perl-Tidy >=virtual/perl-version-0.770.0 emacs? ( virtual/emacs ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.130.tar.gz
 _eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=59a04b85f6c37b728023efa5ff725df3
+_md5_=aeade89a3b8e622ec399c2130188429c
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.119.0 b/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.119.0
index 4d8b6865d6f0..c26a29b7929d 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.119.0
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Deprecated-1.119.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Perl-Critic-1.118.0 dev-perl/Readonly dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-Deprecated-1.119.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=95c5728f52a72a0b51719c0228afb40b
+_md5_=4117bf1d3fbe0712c9cca116b4ab32de
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r3 b/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r3
index 3e2409e26f68..c817a57902f1 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r3
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Dynamic-0.50.0-r3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Perl-Critic >=dev-perl/Devel-Symdump-2.08 dev-perl/Readonly dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-Dynamic-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=92a42f9e219844e468380ff9c5f655e5
+_md5_=816dbecab522c2ca15acd23e1996d82d
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
index 25c979cc2be0..0af31eeb04b7 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Perl-Critic dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KC/KCOWGILL/Perl-Critic-Nits-v1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d76cba8fecb57e358f4957e7563acd6b
+_md5_=3ecb307a1b3f805f382f0007d99d84d7
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
index 9778ebe9f126..d843568ffbc7 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/indirect-0.250.0 dev-perl/Perl-Critic-Dynamic dev-perl/Perl-Critic dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/Perl-Critic-Policy-Dynamic-NoIndirect-0.06.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b6239487042187a749d00ab5eb8bc9d
+_md5_=b7ae41024a1aa4faa50d227a54f800db
diff --git a/metadata/md5-cache/dev-perl/Perl-MinimumVersion-1.380.0 b/metadata/md5-cache/dev-perl/Perl-MinimumVersion-1.380.0
index e0e4f21244d4..4f215ae448bb 100644
--- a/metadata/md5-cache/dev-perl/Perl-MinimumVersion-1.380.0
+++ b/metadata/md5-cache/dev-perl/Perl-MinimumVersion-1.380.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/File-Find-Rule dev-perl/File-Find-Rule-Perl virtual/perl-File-Spec virtual/perl-Getopt-Long >=dev-perl/PPI-1.215.0 >=dev-perl/PPIx-Regexp-0.33.0 >=dev-perl/Params-Util-0.250.0 >=dev-perl/Perl-Critic-1.104.0 >=virtual/perl-Scalar-List-Utils-1.200.0 >=virtual/perl-version-0.760.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Perl-MinimumVersion-1.38.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=395b633ab8ce0ae3b55b3bee470489cd
+_md5_=cc1f5e2117c9230cfe02891ed944b873
diff --git a/metadata/md5-cache/dev-perl/Perl-PrereqScanner-1.23.0 b/metadata/md5-cache/dev-perl/Perl-PrereqScanner-1.23.0
index d840ccceacd5..34e132548bf4 100644
--- a/metadata/md5-cache/dev-perl/Perl-PrereqScanner-1.23.0
+++ b/metadata/md5-cache/dev-perl/Perl-PrereqScanner-1.23.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-Requirements-2.124.0 virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Getopt-Long-Descriptive dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Path dev-perl/Moose >=dev-perl/PPI-1.215.0 dev-perl/Params-Util >=dev-perl/String-RewritePrefix-0.5.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.023.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c4346dd7b9b71e965f02f1c14f917b79
+_md5_=c0c8d7b58fd372ae4a9c6589b5059222
diff --git a/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0 b/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0
index 731891b9642d..0af8201de068 100644
--- a/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0
+++ b/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-Find-Rule virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/Module-Locate dev-perl/Path-Tiny virtual/perl-parent !minimal? ( dev-perl/PPI ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OS/OSFAMERON/Perl-Tags-0.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=81292d3d16614c1bc9fab0f2a582e06c
+_md5_=d43af3effaf29cff1864865d161da861
diff --git a/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0-r1 b/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0-r1
index 4afc2a92ffd7..da56d9e472c0 100644
--- a/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0-r1
+++ b/metadata/md5-cache/dev-perl/Perl-Tags-0.320.0-r1
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-Find-Rule virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/Module-Locate dev-perl/Path-Tiny virtual/perl-parent !minimal? ( dev-perl/PPI ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OS/OSFAMERON/Perl-Tags-0.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3038364e0cd74d1fe30b3436b4a28122
+_md5_=db7772af49a2b0cdd3e386b4a102f804
diff --git a/metadata/md5-cache/dev-perl/Perl-Version-1.13.0 b/metadata/md5-cache/dev-perl/Perl-Version-1.13.0
index 0eb5daf49237..0d406d6aa964 100644
--- a/metadata/md5-cache/dev-perl/Perl-Version-1.13.0
+++ b/metadata/md5-cache/dev-perl/Perl-Version-1.13.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/File-Slurp-Tiny >=virtual/perl-Getopt-Long-2.340.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Perl-Version-1.013.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=29ffd5f49eef88b373b23e253d696a43
+_md5_=fb781b1763d29e57ffb6b58e1d153e7c
diff --git a/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0 b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
index 56bac07fb446..e7dc41f40d65 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.011.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6803bad6244c604a9a68c29518db491d
+_md5_=69be0b365da0ab40a0d28a0d2c60c1ab
diff --git a/metadata/md5-cache/dev-perl/PerlIO-eol-0.160.0 b/metadata/md5-cache/dev-perl/PerlIO-eol-0.160.0
index 6e96d0cc90f9..0e5e55a883df 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-eol-0.160.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-eol-0.160.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=240a24153ede73a656720ba2f07be0ce
+_md5_=91f73bfb1f49b73e32b98789338e25e7
diff --git a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0 b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
index 1675bc7473a3..7f5c59f58215 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c037154013b9f29a2229937085fe7ea0
+_md5_=94b6dfa501a50019603f18ebd33777ce
diff --git a/metadata/md5-cache/dev-perl/PerlIO-via-Timeout-0.320.0 b/metadata/md5-cache/dev-perl/PerlIO-via-Timeout-0.320.0
index fa5cadf1f170..815e0713ff07 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-via-Timeout-0.320.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-via-Timeout-0.320.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAMS/PerlIO-via-Timeout-0.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=99c127a29509ab106029c954b9b2c45d
+_md5_=6f78397282c2e7ff940a37dbb42fb799
diff --git a/metadata/md5-cache/dev-perl/Plack-1.4.400 b/metadata/md5-cache/dev-perl/Plack-1.4.400
index 8890eee0a39d..9bdb682f09c3 100644
--- a/metadata/md5-cache/dev-perl/Plack-1.4.400
+++ b/metadata/md5-cache/dev-perl/Plack-1.4.400
@@ -7,7 +7,8 @@ IUSE=test minimal examples examples
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/CGI-Compile dev-perl/CGI-Emulate-PSGI dev-perl/FCGI dev-perl/FCGI-ProcManager >=dev-perl/libwww-perl-5.814.0 >=dev-perl/Log-Dispatch-2.250.0 dev-perl/Log-Log4perl dev-perl/Module-Refresh ) >=dev-perl/Apache-LogFormat-Compiler-0.330.0 >=dev-perl/Cookie-Baker-0.70.0 >=dev-perl/Devel-StackTrace-1.230.0 >=dev-perl/Devel-StackTrace-AsHTML-0.110.0 >=dev-perl/File-ShareDir-1.0.0 dev-perl/Filesys-Notify-Simple >=dev-perl/HTTP-Entity-Parser-0.170.0 >=dev-perl/HTTP-Headers-Fast-0.180.0 >=dev-perl/HTTP-Message-5.814.0 >=virtual/perl-HTTP-Tiny-0.34.0 >=dev-perl/Hash-MultiValue-0.50.0 >=virtual/perl-Pod-Parser-1.360.0 >=dev-perl/Stream-Buffered-0.20.0 >=dev-perl/Test-TCP-2.150.0 dev-perl/Try-Tiny >=dev-perl/URI-1.590.0 >=dev-perl/WWW-Form-UrlEncoded-0.230.0 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0044.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=11f21084b75abed74eaa68db77ce6c6c
+_md5_=dee1c0938a37c84de49a70051810463a
diff --git a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2 b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
index 42128900cbb8..1fd535d6f575 100644
--- a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
+++ b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Bit-Vector-Minimal-1.0.0 virtual/perl-Carp >=dev-perl/Class-Accessor-0.180.0 >=dev-perl/Class-Virtual-0.30.0 virtual/perl-Encode virtual/perl-File-Spec virtual/perl-IO dev-perl/Lingua-Stem >=virtual/perl-Scalar-List-Utils-1.130.0 >=virtual/perl-Memoize-1.10.0 >=dev-perl/Tie-Array-Sorted-1.100.0 virtual/perl-Time-Piece dev-perl/Encode-compat dev-perl/File-Slurp dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Plucene-1.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45a7ee69d323dca189343cb41f826eb5
+_md5_=720fe1c3bb923e34a7068bf0cee7b39c
diff --git a/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r1 b/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r1
index 30d8ffe55466..2b58a5da4980 100644
--- a/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Pod-Abstract-0.200.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-String virtual/perl-Scalar-List-Utils virtual/perl-File-Temp dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BL/BLILBURNE/Pod-Abstract-0.20.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5413e9b200ef20705dc3c18bb7546dee
+_md5_=d3ac5b696b107eb7e6c9d29876a01521
diff --git a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1 b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
index 4a4d3351e6f6..d35f4bdc2ce4 100644
--- a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
+++ b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Pod-Parser-1.13 >=dev-perl/Devel-Symdump-2.01 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=806a116db7a68610e4629676533486d7
+_md5_=ce97c4477c67ecc4ac7accf751d35af0
diff --git a/metadata/md5-cache/dev-perl/Pod-Elemental-0.103.4 b/metadata/md5-cache/dev-perl/Pod-Elemental-0.103.4
index f98ab856c367..d05119dabcc8 100644
--- a/metadata/md5-cache/dev-perl/Pod-Elemental-0.103.4
+++ b/metadata/md5-cache/dev-perl/Pod-Elemental-0.103.4
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Load virtual/perl-Encode virtual/perl-Scalar-List-Utils dev-perl/Mixin-Linewise dev-perl/Moose dev-perl/MooseX-Types >=dev-perl/Pod-Eventual-0.4.0 dev-perl/String-RewritePrefix dev-perl/String-Truncate dev-perl/Sub-Exporter dev-perl/Sub-Exporter-ForMethods dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1be187af7766e35a7e3fc9e0ae818a2c
+_md5_=2af3dd1388819bcee2046d775da8dce8
diff --git a/metadata/md5-cache/dev-perl/Pod-Elemental-PerlMunger-0.200.6 b/metadata/md5-cache/dev-perl/Pod-Elemental-PerlMunger-0.200.6
index 17551d333469..72f73202e876 100644
--- a/metadata/md5-cache/dev-perl/Pod-Elemental-PerlMunger-0.200.6
+++ b/metadata/md5-cache/dev-perl/Pod-Elemental-PerlMunger-0.200.6
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode virtual/perl-Scalar-List-Utils dev-perl/Moose dev-perl/PPI dev-perl/Params-Util >=dev-perl/Pod-Elemental-0.103.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=00847999a526355618bea3af90e01c9c
+_md5_=8b0da98b5a9877c0c505e44bcfbac730
diff --git a/metadata/md5-cache/dev-perl/Pod-Eventual-0.94.1 b/metadata/md5-cache/dev-perl/Pod-Eventual-0.94.1
index 4b3ceb670516..5a5e0393f6a1 100644
--- a/metadata/md5-cache/dev-perl/Pod-Eventual-0.94.1
+++ b/metadata/md5-cache/dev-perl/Pod-Eventual-0.94.1
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Mixin-Linewise-0.102.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b41e93b76c3982da45ff1cfba0940016
+_md5_=6efad1ceb0a483c88d14af3762c58991
diff --git a/metadata/md5-cache/dev-perl/Pod-Markdown-3.5.0 b/metadata/md5-cache/dev-perl/Pod-Markdown-3.5.0
index 8d3558bd6958..867d7eee99d1 100644
--- a/metadata/md5-cache/dev-perl/Pod-Markdown-3.5.0
+++ b/metadata/md5-cache/dev-perl/Pod-Markdown-3.5.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/HTML-Parser ) virtual/perl-Encode virtual/perl-Getopt-Long >=virtual/perl-Pod-Simple-3.270.0 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a15ffb2a3d1ced1a194bd093f96c9b8a
+_md5_=98bbd377cbd2f78d1089bb989c500948
diff --git a/metadata/md5-cache/dev-perl/Pod-POM-2.10.0 b/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
index a61071561b9e..503d2d660121 100644
--- a/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
+++ b/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Pod-POM-2.01.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fb50559465e7f5eccba81c854185e3df
+_md5_=5367c2c15560b52605108a3a6e56dbbe
diff --git a/metadata/md5-cache/dev-perl/Pod-POM-View-Restructured-1.0.1 b/metadata/md5-cache/dev-perl/Pod-POM-View-Restructured-1.0.1
index 9156ba833b22..b5fd42db74e9 100644
--- a/metadata/md5-cache/dev-perl/Pod-POM-View-Restructured-1.0.1
+++ b/metadata/md5-cache/dev-perl/Pod-POM-View-Restructured-1.0.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/Pod-POM dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXM/Pod-POM-View-Restructured-1.000001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=edb1140144743e67a3d7822d0a2fe52e
+_md5_=f2d25e7c7dbde8e60adaf69bd03dd486
diff --git a/metadata/md5-cache/dev-perl/Pod-Readme-1.1.2 b/metadata/md5-cache/dev-perl/Pod-Readme-1.1.2
index 510a503a0fdc..f3799239f83e 100644
--- a/metadata/md5-cache/dev-perl/Pod-Readme-1.1.2
+++ b/metadata/md5-cache/dev-perl/Pod-Readme-1.1.2
@@ -7,7 +7,8 @@ IUSE=minimal test
 KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Pod-Markdown dev-perl/Pod-Simple-LaTeX dev-perl/Type-Tiny-XS virtual/perl-podlators ) >=dev-perl/CPAN-Changes-0.300.0 virtual/perl-CPAN-Meta virtual/perl-Carp >=dev-perl/Class-Method-Modifiers-2.0.0 virtual/perl-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.560.0 dev-perl/File-Slurp dev-perl/Getopt-Long-Descriptive virtual/perl-IO virtual/perl-Module-CoreList virtual/perl-Module-Load >=dev-perl/Moo-1.4.5 dev-perl/MooX-HandlesVia >=dev-perl/Path-Tiny-0.18.0 virtual/perl-Pod-Simple dev-perl/Role-Tiny >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Try-Tiny dev-perl/Type-Tiny dev-perl/namespace-autoclean >=virtual/perl-version-0.770.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRWO/Pod-Readme-v1.1.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8ad031faa1a8d4ea1ceb5e709bc71bee
+_md5_=be5bd7eea050218b3752de30a6b16168
diff --git a/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0 b/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0
index 4c3df5867215..fd52300a43d6 100644
--- a/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0
+++ b/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Pod-Simple-0.10.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JG/JGOFF/Pod-Simple-LaTeX-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b983404318b88711e3903fa6436ffc9d
+_md5_=f9d986c5ee30e780130694b2b91fb4e8
diff --git a/metadata/md5-cache/dev-perl/Pod-Spell-1.200.0 b/metadata/md5-cache/dev-perl/Pod-Spell-1.200.0
index 04e0b2070149..80de52aab050 100644
--- a/metadata/md5-cache/dev-perl/Pod-Spell-1.200.0
+++ b/metadata/md5-cache/dev-perl/Pod-Spell-1.200.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-Tiny dev-perl/File-ShareDir dev-perl/Lingua-EN-Inflect dev-perl/Path-Tiny virtual/perl-Pod-Escapes virtual/perl-Pod-Parser virtual/perl-Text-Tabs+Wrap virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz mirror://gentoo/podspell.1.gz https://dev.gentoo.org/~tove/files/podspell.1.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f98cec5f438977eb7ae8acb8998a9c4a
+_md5_=8fed8502f6b8a80239f64d1aed1c3dac
diff --git a/metadata/md5-cache/dev-perl/Pod-Strip-1.20.0-r1 b/metadata/md5-cache/dev-perl/Pod-Strip-1.20.0-r1
index 9b40fcabf72d..3a3cdc05c48f 100644
--- a/metadata/md5-cache/dev-perl/Pod-Strip-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Pod-Strip-1.20.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Pod-Simple-3.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c4b4e013c73e28785af595f77cb606b5
+_md5_=6ab977ec07763dd6c1d163b7ac2d440d
diff --git a/metadata/md5-cache/dev-perl/Pod-Weaver-4.15.0 b/metadata/md5-cache/dev-perl/Pod-Weaver-4.15.0
index 29b4b4483a6e..ab840fb91d8a 100644
--- a/metadata/md5-cache/dev-perl/Pod-Weaver-4.15.0
+++ b/metadata/md5-cache/dev-perl/Pod-Weaver-4.15.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Config-MVP-2.0.0 dev-perl/Config-MVP-Reader-INI dev-perl/DateTime virtual/perl-File-Spec dev-perl/List-MoreUtils >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Log-Dispatchouli-1.100.710 >=dev-perl/Mixin-Linewise-0.103.0 dev-perl/Module-Runtime dev-perl/Moose dev-perl/Params-Util >=dev-perl/Pod-Elemental-0.100.220 >=dev-perl/String-Flogger-1.0.0 >=dev-perl/String-Formatter-0.100.680 dev-perl/String-RewritePrefix virtual/perl-Text-Tabs+Wrap dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.015.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=99b813ccbcef43fba2765705b4a44d67
+_md5_=40b2b5ed6b9319c87cf09027558dee94
diff --git a/metadata/md5-cache/dev-perl/PostScript-Simple-0.90.0 b/metadata/md5-cache/dev-perl/PostScript-Simple-0.90.0
index d07a01f2672a..3fe8f93cdaa8 100644
--- a/metadata/md5-cache/dev-perl/PostScript-Simple-0.90.0
+++ b/metadata/md5-cache/dev-perl/PostScript-Simple-0.90.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 hppa ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MC/MCNEWTON/PostScript-Simple-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=53202f8df5108335e03961ca88ed51c4
+_md5_=26f05cb67b1e4b6097f0749ef3ca017c
diff --git a/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0 b/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0
index b171472366de..6578bd27b026 100644
--- a/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0
+++ b/metadata/md5-cache/dev-perl/Probe-Perl-0.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KW/KWILLIAMS/Probe-Perl-0.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bff078b1c85f19b7e3f9ca140a4ad542
+_md5_=2cf248383ec591450b7c4e126e14c90f
diff --git a/metadata/md5-cache/dev-perl/Proc-Guard-0.70.0 b/metadata/md5-cache/dev-perl/Proc-Guard-0.70.0
index aeb3dcd770fc..95c2940bccd4 100644
--- a/metadata/md5-cache/dev-perl/Proc-Guard-0.70.0
+++ b/metadata/md5-cache/dev-perl/Proc-Guard-0.70.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Accessor-Lite-0.50.0 >=virtual/perl-Exporter-5.630.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Proc-Guard-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5f4abe89af25ba6c36413275217c1c8f
+_md5_=9ec623e417140ab890ea0a669057fb17
diff --git a/metadata/md5-cache/dev-perl/Proc-Simple-1.320.0 b/metadata/md5-cache/dev-perl/Proc-Simple-1.320.0
index c4a5c08ad3dc..fc4c86c54cd0 100644
--- a/metadata/md5-cache/dev-perl/Proc-Simple-1.320.0
+++ b/metadata/md5-cache/dev-perl/Proc-Simple-1.320.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/Proc-Simple-1.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f0d382fa345aa585f95c92cef04a75d9
+_md5_=7aef8dfb586fac7a1f5f9963f71c4cce
diff --git a/metadata/md5-cache/dev-perl/REST-Client-273 b/metadata/md5-cache/dev-perl/REST-Client-273
index 0276deb1bb51..958ec4c990f1 100644
--- a/metadata/md5-cache/dev-perl/REST-Client-273
+++ b/metadata/md5-cache/dev-perl/REST-Client-273
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/LWP-Protocol-https dev-perl/libwww-perl dev-perl/URI dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KK/KKANE/REST-Client-273.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5a9c691baf2a640e12e4376d36abb402
+_md5_=4e7ad15bb1522dc066274d29dd9993d0
diff --git a/metadata/md5-cache/dev-perl/RPC-XML-0.790.0 b/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
index d74b2d4ce945..4cfaa353354c 100644
--- a/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
+++ b/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic-2 LGPL-2.1 )
 RDEPEND=>=virtual/perl-File-Spec-0.800.0 >=dev-perl/libwww-perl-5.834.0 >=virtual/perl-Module-Load-0.240.0 >=virtual/perl-Scalar-List-Utils-1.200.0 >=dev-perl/XML-LibXML-1.850.0 >=dev-perl/XML-Parser-2.310.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.79.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=885f0e15d4f93dd9dbb5b12c9e2463c6
+_md5_=5df066c6d10c9ae4969604441fb3cbf3
diff --git a/metadata/md5-cache/dev-perl/RPC-XML-0.800.0 b/metadata/md5-cache/dev-perl/RPC-XML-0.800.0
index bbc5be3fcaa0..e60d1e014a7b 100644
--- a/metadata/md5-cache/dev-perl/RPC-XML-0.800.0
+++ b/metadata/md5-cache/dev-perl/RPC-XML-0.800.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ppc ~x86
 LICENSE=|| ( Artistic-2 LGPL-2.1 )
 RDEPEND=>=virtual/perl-File-Spec-0.800.0 >=dev-perl/libwww-perl-5.834.0 >=virtual/perl-Module-Load-0.240.0 >=virtual/perl-Scalar-List-Utils-1.200.0 >=dev-perl/XML-LibXML-1.850.0 >=dev-perl/XML-Parser-2.310.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.80.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f098201c69d8afb894b451b808d31d42
+_md5_=5dd851c65bd4abee9a76d1977cc2c1b6
diff --git a/metadata/md5-cache/dev-perl/RRD-Simple-1.440.0-r2 b/metadata/md5-cache/dev-perl/RRD-Simple-1.440.0-r2
index bf20b3f1c277..8673a5e1d6a5 100644
--- a/metadata/md5-cache/dev-perl/RRD-Simple-1.440.0-r2
+++ b/metadata/md5-cache/dev-perl/RRD-Simple-1.440.0-r2
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-analyzer/rrdtool[perl] dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NICOLAW/RRD-Simple-1.44.tar.gz https://dev.gentoo.org/~kentnl/distfiles/RRD-Simple-1.44-patches-1.tar.xz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4a034aa269d94d683f50623e50352fa3
+_md5_=8f82c271042912933932d77a46ea9944
diff --git a/metadata/md5-cache/dev-perl/Readonly-2.0.0 b/metadata/md5-cache/dev-perl/Readonly-2.0.0
index 17b30a594646..7f762a66457b 100644
--- a/metadata/md5-cache/dev-perl/Readonly-2.0.0
+++ b/metadata/md5-cache/dev-perl/Readonly-2.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SANKO/Readonly-2.00.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=80f3e8a698a31130e80bc6cd6b955abe
+_md5_=03438c4da6cdbe30092800080103e34a
diff --git a/metadata/md5-cache/dev-perl/Readonly-2.10.0 b/metadata/md5-cache/dev-perl/Readonly-2.10.0
index 39d87dc0d426..80c1146afe55 100644
--- a/metadata/md5-cache/dev-perl/Readonly-2.10.0
+++ b/metadata/md5-cache/dev-perl/Readonly-2.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SANKO/Readonly-2.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6da3133dcb57e519459f2fe450f86f6d
+_md5_=e06e7108c9a64d495904754ff03b4516
diff --git a/metadata/md5-cache/dev-perl/Readonly-2.50.0 b/metadata/md5-cache/dev-perl/Readonly-2.50.0
index 101bcb931ccb..fea6637ae1d5 100644
--- a/metadata/md5-cache/dev-perl/Readonly-2.50.0
+++ b/metadata/md5-cache/dev-perl/Readonly-2.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SANKO/Readonly-2.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d458cfe0292195ddb6411697ad9668ae
+_md5_=178e79e0a37629f6c52f3545524df26c
diff --git a/metadata/md5-cache/dev-perl/Redis-1.991.0 b/metadata/md5-cache/dev-perl/Redis-1.991.0
index f22e7956bb64..704d6bbd989b 100644
--- a/metadata/md5-cache/dev-perl/Redis-1.991.0
+++ b/metadata/md5-cache/dev-perl/Redis-1.991.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/IO-Socket-Timeout-0.290.0 dev-perl/Try-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAMS/Redis-1.991.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3add3050637fd17998c519fc093d3549
+_md5_=6f3142007d6cc650e40b682c1be2da8c
diff --git a/metadata/md5-cache/dev-perl/RedisDB-2.360.0 b/metadata/md5-cache/dev-perl/RedisDB-2.360.0
index 4b0e5ef49ddb..a2fe02f71fbc 100644
--- a/metadata/md5-cache/dev-perl/RedisDB-2.360.0
+++ b/metadata/md5-cache/dev-perl/RedisDB-2.360.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode virtual/perl-IO-Socket-IP dev-perl/RedisDB-Parser dev-perl/Try-Tiny dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZW/ZWON/RedisDB-2.36.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0e22d50543ab2a6181088db73f61a94f
+_md5_=59f2ffc88c1acbe4a2f08541c43e944a
diff --git a/metadata/md5-cache/dev-perl/RedisDB-2.540.0 b/metadata/md5-cache/dev-perl/RedisDB-2.540.0
index 97aabf1fa313..795a646be3eb 100644
--- a/metadata/md5-cache/dev-perl/RedisDB-2.540.0
+++ b/metadata/md5-cache/dev-perl/RedisDB-2.540.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Encode-2.100.0 virtual/perl-IO-Socket-IP >=dev-perl/RedisDB-Parser-2.210.0 dev-perl/Try-Tiny dev-perl/URI dev-perl/URI-redis >=dev-perl/Test-TCP-1.170.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZW/ZWON/RedisDB-2.54.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3ae332bcd367db7ea770f6468ff538fd
+_md5_=3c33b009796c780543a37c003a8dec75
diff --git a/metadata/md5-cache/dev-perl/RedisDB-Parser-2.220.0 b/metadata/md5-cache/dev-perl/RedisDB-Parser-2.220.0
index 81c8d8524aba..22f2b440cc9c 100644
--- a/metadata/md5-cache/dev-perl/RedisDB-Parser-2.220.0
+++ b/metadata/md5-cache/dev-perl/RedisDB-Parser-2.220.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Encode-2.100.0 dev-perl/Try-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZW/ZWON/RedisDB-Parser-2.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b80bbbc3b6302c81d86ca845132afee1
+_md5_=676189af698a687c273cddf12c1d9d41
diff --git a/metadata/md5-cache/dev-perl/Ref-Util-0.203.0 b/metadata/md5-cache/dev-perl/Ref-Util-0.203.0
index 8d2cb5be3729..d42dbcc3d25e 100644
--- a/metadata/md5-cache/dev-perl/Ref-Util-0.203.0
+++ b/metadata/md5-cache/dev-perl/Ref-Util-0.203.0
@@ -7,7 +7,8 @@ IUSE=test +xs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=xs? ( dev-perl/Ref-Util-XS ) >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AR/ARC/Ref-Util-0.203.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=abbb882826f982c92b092920c1fb217a
+_md5_=6d06ebe04b9ebf4ae0ba8cae75107071
diff --git a/metadata/md5-cache/dev-perl/Ref-Util-XS-0.116.0 b/metadata/md5-cache/dev-perl/Ref-Util-XS-0.116.0
index a4a19c40945a..0c0940ef28e0 100644
--- a/metadata/md5-cache/dev-perl/Ref-Util-XS-0.116.0
+++ b/metadata/md5-cache/dev-perl/Ref-Util-XS-0.116.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XS/XSAWYERX/Ref-Util-XS-0.116.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6d2b53f1eaccebd8978403ad7285383a
+_md5_=75d3cf3055273d3971cfa1de283e908c
diff --git a/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0 b/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0
index a82051a2d8dd..c1e0b8564efd 100644
--- a/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0
+++ b/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic Artistic-2 MIT BSD )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2a9908ba2aedcf018cdc12415abb5d2d
+_md5_=b2c3b30026544f43ea935f0f6a3b392d
diff --git a/metadata/md5-cache/dev-perl/Regexp-Common-net-CIDR-0.30.0 b/metadata/md5-cache/dev-perl/Regexp-Common-net-CIDR-0.30.0
index c51a34595916..a78b8b97ab4a 100644
--- a/metadata/md5-cache/dev-perl/Regexp-Common-net-CIDR-0.30.0
+++ b/metadata/md5-cache/dev-perl/Regexp-Common-net-CIDR-0.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Regexp-Common dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPS/Regexp-Common-net-CIDR-0.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=50e3f707ef15cd7b8680340a34dcfcf9
+_md5_=e1e03e3b615bcc90432cb4371a6465d5
diff --git a/metadata/md5-cache/dev-perl/Regexp-RegGrp-2.10.0 b/metadata/md5-cache/dev-perl/Regexp-RegGrp-2.10.0
index 5b7856a48eed..af2d94c3d557 100644
--- a/metadata/md5-cache/dev-perl/Regexp-RegGrp-2.10.0
+++ b/metadata/md5-cache/dev-perl/Regexp-RegGrp-2.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/Regexp-RegGrp-2.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fb0ce9da086c0169cb5dcbe90c27e1ad
+_md5_=6c6ae87637e6cff61b3f88a288817d82
diff --git a/metadata/md5-cache/dev-perl/Regexp-Util-0.3.0 b/metadata/md5-cache/dev-perl/Regexp-Util-0.3.0
index b35f787daa19..4fa816717536 100644
--- a/metadata/md5-cache/dev-perl/Regexp-Util-0.3.0
+++ b/metadata/md5-cache/dev-perl/Regexp-Util-0.3.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Regexp-Util-0.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d9d8e6edd09f07ffb64f5c6634dd29c6
+_md5_=f0cd399f961becff2445a68fa7eb40c0
diff --git a/metadata/md5-cache/dev-perl/Return-Value-1.666.5 b/metadata/md5-cache/dev-perl/Return-Value-1.666.5
index ea7f2881cfc2..52e3ddf0e8ce 100644
--- a/metadata/md5-cache/dev-perl/Return-Value-1.666.5
+++ b/metadata/md5-cache/dev-perl/Return-Value-1.666.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~mips ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=15d365b0f3df184906112c86c76b395c
+_md5_=6a6f022eda7ad5537108d7d5c7a24c92
diff --git a/metadata/md5-cache/dev-perl/Role-Basic-0.130.0 b/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
index 377398fba025..b0f80c54e32d 100644
--- a/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
+++ b/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=425bfa47e3679e7b399b01e1cf13e174
+_md5_=264a295d3b6cd6284045128fef97cc14
diff --git a/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0 b/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0
index 3b78166974b7..c17d3e573ba5 100644
--- a/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0
+++ b/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose dev-perl/MooseX-Role-Parameterized dev-perl/String-Errf dev-perl/Try-Tiny dev-perl/namespace-clean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=22c025f349b6101278e6e5a83bd012c6
+_md5_=5ab145147cc354946d84f675f4cfd44b
diff --git a/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0 b/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0
index 4c9e21fa73e0..e6192415e03f 100644
--- a/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0
+++ b/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d7bf2018c2cd0f0d8236c9ca8cf22de9
+_md5_=e8ef27d41a042ebdb0878acf1410a3de
diff --git a/metadata/md5-cache/dev-perl/Role-Tiny-2.0.5 b/metadata/md5-cache/dev-perl/Role-Tiny-2.0.5
index c17eb79eaa39..eb1ff784ebe0 100644
--- a/metadata/md5-cache/dev-perl/Role-Tiny-2.0.5
+++ b/metadata/md5-cache/dev-perl/Role-Tiny-2.0.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 !<dev-perl/Moo-0.9.14 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.000005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8b9bcb4efeb69bd2fdd0838a5a0b5320
+_md5_=341fc84ac964041a165b1aabe8979659
diff --git a/metadata/md5-cache/dev-perl/Role-Tiny-2.0.6 b/metadata/md5-cache/dev-perl/Role-Tiny-2.0.6
index 594f61e4af91..c99ff2d228b7 100644
--- a/metadata/md5-cache/dev-perl/Role-Tiny-2.0.6
+++ b/metadata/md5-cache/dev-perl/Role-Tiny-2.0.6
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 !<dev-perl/Moo-0.9.14 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.000006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ec2ef5cb61da525a64ca512505368608
+_md5_=eb06104fcbbe30c3ed485c179caf6bd7
diff --git a/metadata/md5-cache/dev-perl/Roman-1.240.0 b/metadata/md5-cache/dev-perl/Roman-1.240.0
index ed8c9aa3fcc2..a9a3e7386014 100644
--- a/metadata/md5-cache/dev-perl/Roman-1.240.0
+++ b/metadata/md5-cache/dev-perl/Roman-1.240.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~mips ~s390 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Roman-1.24.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3cdd2a9e94b6a772c52d7542d7e0e83
+_md5_=86a69732f03f88976f71e320942b97fa
diff --git a/metadata/md5-cache/dev-perl/Router-Simple-0.170.0 b/metadata/md5-cache/dev-perl/Router-Simple-0.170.0
index 44c942c78fcc..9853cc2dce87 100644
--- a/metadata/md5-cache/dev-perl/Router-Simple-0.170.0
+++ b/metadata/md5-cache/dev-perl/Router-Simple-0.170.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor-Lite virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Router-Simple-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=34fbcbab58508889840ece0e21a05c0e
+_md5_=22642b382fefa02d2a803858ad73bd02
diff --git a/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0 b/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
index 194db5b763be..19295d50d45b 100644
--- a/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
+++ b/metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
@@ -7,7 +7,8 @@ IUSE=ssl test xmpp
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI >=dev-perl/XML-Parser-2.230.0 dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) xmpp? ( dev-perl/Net-Jabber ) dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.19.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=80eaabab53d4d46c12d72b85d618b094
+_md5_=e14a1a9dfa1f3c59b8510bf55f7f71ea
diff --git a/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0 b/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
index abc0096ea7b7..6f09058c2762 100644
--- a/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
+++ b/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
@@ -7,7 +7,8 @@ IUSE=ssl test xmpp examples
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI >=dev-perl/XML-Parser-2.230.0 dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) xmpp? ( dev-perl/Net-Jabber ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.26.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dfa7419cacb2b1767faf900568b1135b
+_md5_=28d816a790105290cd95904ce44fe8b5
diff --git a/metadata/md5-cache/dev-perl/SOAP-WSDL-3.3.0 b/metadata/md5-cache/dev-perl/SOAP-WSDL-3.3.0
index bb8d70a34e2c..c147b9a96317 100644
--- a/metadata/md5-cache/dev-perl/SOAP-WSDL-3.3.0
+++ b/metadata/md5-cache/dev-perl/SOAP-WSDL-3.3.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Load-0.200.0 >=dev-perl/Class-Std-Fast-0.0.5 virtual/perl-Data-Dumper dev-perl/TimeDate virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/libwww-perl dev-perl/Module-Build virtual/perl-Scalar-List-Utils virtual/perl-Storable >=dev-perl/Template-Toolkit-2.180.0 dev-perl/TermReadKey dev-perl/URI dev-perl/XML-Parser dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SW/SWALTERS/SOAP-WSDL-3.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dfc3632b92e6698ee7897b0217c5fa4b
+_md5_=feccb129aa8f658a26ab174d24deeb54
diff --git a/metadata/md5-cache/dev-perl/SQL-Abstract-1.840.0 b/metadata/md5-cache/dev-perl/SQL-Abstract-1.840.0
index 22961db5f3eb..d3a50059b72e 100644
--- a/metadata/md5-cache/dev-perl/SQL-Abstract-1.840.0
+++ b/metadata/md5-cache/dev-perl/SQL-Abstract-1.840.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ~ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 >=dev-perl/Hash-Merge-0.120.0 virtual/perl-Scalar-List-Utils >=dev-perl/MRO-Compat-0.120.0 >=dev-perl/Moo-2.0.1 >=dev-perl/Sub-Quote-2.0.1 >=virtual/perl-Text-Balanced-2.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.84.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6ef760e8320a2746ef294f68dcf5cc6c
+_md5_=da0092c8b33818f58f31f49440415e03
diff --git a/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1 b/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
index 691f02863498..9968945a9649 100644
--- a/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
+++ b/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/SQL-Abstract dev-perl/DBI dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-0.141.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d686fde77fe06be58aa0b36246d72c29
+_md5_=47a4c40fe79b66388e52159c338915c2
diff --git a/metadata/md5-cache/dev-perl/SQL-Statement-1.412.0 b/metadata/md5-cache/dev-perl/SQL-Statement-1.412.0
index dcbb299f93f1..adf541c2c5ce 100644
--- a/metadata/md5-cache/dev-perl/SQL-Statement-1.412.0
+++ b/metadata/md5-cache/dev-perl/SQL-Statement-1.412.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Math-Base-Convert >=virtual/perl-Math-Complex-1.560.0 >=dev-perl/Text-Soundex-3.40.0 ) virtual/perl-Carp >=dev-perl/Clone-0.300.0 virtual/perl-Data-Dumper dev-perl/Module-Runtime >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.0.0 virtual/perl-Text-Balanced dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.412.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cabff517f68f64902188f8e218db86b8
+_md5_=876c29f1dc36b97f1273867209c89c5d
diff --git a/metadata/md5-cache/dev-perl/SQL-Translator-0.110.230 b/metadata/md5-cache/dev-perl/SQL-Translator-0.110.230
index 9c48f31f5e35..07792f509f30 100644
--- a/metadata/md5-cache/dev-perl/SQL-Translator-0.110.230
+++ b/metadata/md5-cache/dev-perl/SQL-Translator-0.110.230
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Carp-Clan >=dev-perl/DBI-1.540.0 virtual/perl-Digest-SHA >=dev-perl/File-ShareDir-1.0.0 >=dev-perl/Moo-1.0.3 >=dev-perl/Package-Variant-1.1.1 >=dev-perl/Parse-RecDescent-1.967.9 virtual/perl-Scalar-List-Utils dev-perl/Sub-Quote >=dev-perl/Try-Tiny-0.40.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-0.11023.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=173e8cf01ae5f700d4f3e24642aec0a7
+_md5_=c90a788ad25f10c124108624c65e4cf0
diff --git a/metadata/md5-cache/dev-perl/SRU-1.10.0 b/metadata/md5-cache/dev-perl/SRU-1.10.0
index 3a6872f8b901..5d980877e8e5 100644
--- a/metadata/md5-cache/dev-perl/SRU-1.10.0
+++ b/metadata/md5-cache/dev-perl/SRU-1.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CQL-Parser-1.120.0 virtual/perl-Carp dev-perl/Class-Accessor dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/SRU-1.01.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e10567e8e9e531bd22239f4cc266cc2f
+_md5_=47721e19acd018161436cdc0acc3d9dd
diff --git a/metadata/md5-cache/dev-perl/SUPER-1.201.411.170 b/metadata/md5-cache/dev-perl/SUPER-1.201.411.170
index 7222eca2d46d..e7d9e6f3d5f0 100644
--- a/metadata/md5-cache/dev-perl/SUPER-1.201.411.170
+++ b/metadata/md5-cache/dev-perl/SUPER-1.201.411.170
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20141117.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c4c4f7f46518856191eb0a67fa223ad6
+_md5_=2a0e9283cfabb7e797b705d570873b02
diff --git a/metadata/md5-cache/dev-perl/SVG-2.820.0 b/metadata/md5-cache/dev-perl/SVG-2.820.0
index 2febe10ac299..de523d6e4633 100644
--- a/metadata/md5-cache/dev-perl/SVG-2.820.0
+++ b/metadata/md5-cache/dev-perl/SVG-2.820.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/SVG-2.82.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0c3c63d40eb55eeaacb0771059e684e4
+_md5_=ee5b4dcac8e230547184730411f05010
diff --git a/metadata/md5-cache/dev-perl/Safe-Isa-1.0.5 b/metadata/md5-cache/dev-perl/Safe-Isa-1.0.5
index 07b400fb5799..99ea7139eeef 100644
--- a/metadata/md5-cache/dev-perl/Safe-Isa-1.0.5
+++ b/metadata/md5-cache/dev-perl/Safe-Isa-1.0.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000005.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0ff4c6e2b6fbcf7583306cf3d4a6b5d5
+_md5_=f394770aec0bcdf4e73c0f583f1f7112
diff --git a/metadata/md5-cache/dev-perl/Safe-Isa-1.0.8 b/metadata/md5-cache/dev-perl/Safe-Isa-1.0.8
index 8f3c59bb582c..95977b4d4735 100644
--- a/metadata/md5-cache/dev-perl/Safe-Isa-1.0.8
+++ b/metadata/md5-cache/dev-perl/Safe-Isa-1.0.8
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0ddee5fc826cf7ef05573b11c8521737
+_md5_=e8401b059304d0f366e6cdf75baa127d
diff --git a/metadata/md5-cache/dev-perl/Sane-0.50.0-r1 b/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
index a1cfc907b02a..47e1d62dbd4e 100644
--- a/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=media-gfx/sane-backends-1.0.19 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RATCLIFFE/Sane-0.05.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=67db3d321ecb8fa9c4cdacda1780011e
+_md5_=64e6438b2d27324eb80949c0b06891b6
diff --git a/metadata/md5-cache/dev-perl/Schedule-Cron-Events-1.950.0 b/metadata/md5-cache/dev-perl/Schedule-Cron-Events-1.950.0
index 9ad3b89ac069..76b861f58d4c 100644
--- a/metadata/md5-cache/dev-perl/Schedule-Cron-Events-1.950.0
+++ b/metadata/md5-cache/dev-perl/Schedule-Cron-Events-1.950.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-Local dev-perl/Set-Crontab dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KO/KOHTS/Schedule-Cron-Events-1.95.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=48c6d08fc5616b352de8ca97c943a5d7
+_md5_=08f0a8b909b4c7bfa66a9558d2dfcb82
diff --git a/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0 b/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0
index eac3170e1bc6..0cbdc227d357 100644
--- a/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0
+++ b/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1a46edee7da361ecb7ed06d46d2af19f
+_md5_=efc2118254f893f101a1ea4b83a2733b
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.0 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.0
index d91ea9ce3789..f933f1266b24 100644
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.0
+++ b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.0
@@ -7,7 +7,8 @@ IUSE=examples test
 KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.0.tar.gz http://oligarchy.co.uk/xapian/1.2.25/Search-Xapian-1.2.25.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3e21a829d1f8c46fde7379b46132c2fb
+_md5_=767daf41ce5d79c66d7904e4cf01bdc7
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.2 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.2
index 97cbc7c62b95..8c3ad8682fbd 100644
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.2
+++ b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.2
@@ -7,7 +7,8 @@ IUSE=examples test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.2.tar.gz http://oligarchy.co.uk/xapian/1.2.25/Search-Xapian-1.2.25.2.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ba45b9cbe5438211053b685e9a0b5f4a
+_md5_=0afc037a29dd843e6851339a94a5d69c
diff --git a/metadata/md5-cache/dev-perl/Sereal-4.4.0 b/metadata/md5-cache/dev-perl/Sereal-4.4.0
index 7b52fcb8ac40..fc0d79962d96 100644
--- a/metadata/md5-cache/dev-perl/Sereal-4.4.0
+++ b/metadata/md5-cache/dev-perl/Sereal-4.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sereal-Encoder-4.4.0 >=dev-perl/Sereal-Decoder-4.4.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=49ccb92f06f163658aa821461b93bdf3
+_md5_=dee76c8524a97975678f6db107df6c14
diff --git a/metadata/md5-cache/dev-perl/Sereal-Decoder-4.4.0 b/metadata/md5-cache/dev-perl/Sereal-Decoder-4.4.0
index c7cae3fcbb31..00e4a37c2f78 100644
--- a/metadata/md5-cache/dev-perl/Sereal-Decoder-4.4.0
+++ b/metadata/md5-cache/dev-perl/Sereal-Decoder-4.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader app-arch/zstd:= dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7a4066d1d99827000db4e0fcee7940fc
+_md5_=17d9fe0df3f24071cc0441b351b1c34e
diff --git a/metadata/md5-cache/dev-perl/Sereal-Encoder-4.4.0 b/metadata/md5-cache/dev-perl/Sereal-Encoder-4.4.0
index f2e2f62ce05e..12d15f3a13c3 100644
--- a/metadata/md5-cache/dev-perl/Sereal-Encoder-4.4.0
+++ b/metadata/md5-cache/dev-perl/Sereal-Encoder-4.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader app-arch/zstd:= dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fda9ce8fcb1f6bba61c00c8d593ca216
+_md5_=8c7a0a21c94a5831cc92939425f79d5c
diff --git a/metadata/md5-cache/dev-perl/Server-Starter-0.330.0 b/metadata/md5-cache/dev-perl/Server-Starter-0.330.0
index 3e475dcf443c..470e6f1c4961 100644
--- a/metadata/md5-cache/dev-perl/Server-Starter-0.330.0
+++ b/metadata/md5-cache/dev-perl/Server-Starter-0.330.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.33.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9d8e241e0e188e017a8943486debebf4
+_md5_=290c1ea78662b83dd7d6363c56f3b6c8
diff --git a/metadata/md5-cache/dev-perl/Set-Object-1.380.0 b/metadata/md5-cache/dev-perl/Set-Object-1.380.0
index 63962a76a1d8..323acb2ec362 100644
--- a/metadata/md5-cache/dev-perl/Set-Object-1.380.0
+++ b/metadata/md5-cache/dev-perl/Set-Object-1.380.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.38.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2c8eab895c14387b7d45cd0ab5d9be15
+_md5_=9afa9fb7f0ba91633cfbd286323694c7
diff --git a/metadata/md5-cache/dev-perl/Shell-0.730.0 b/metadata/md5-cache/dev-perl/Shell-0.730.0
index 77599b6ecd9f..41c165e8e605 100644
--- a/metadata/md5-cache/dev-perl/Shell-0.730.0
+++ b/metadata/md5-cache/dev-perl/Shell-0.730.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Shell-0.73.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=53899cf8e03c692ae89d63ef57c5383a
+_md5_=de15655ce7ea17249e53033f5e1743c3
diff --git a/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0 b/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0
index b0f82c3ec1fd..b019961675b2 100644
--- a/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0
+++ b/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Shell-Guess dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Config-Generate-0.33.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e85a61f434482645228dea111e120e70
+_md5_=6662ef4deb718e405d321feaa8d7c3b6
diff --git a/metadata/md5-cache/dev-perl/Shell-Guess-0.90.0 b/metadata/md5-cache/dev-perl/Shell-Guess-0.90.0
index ddc8eb66ae6a..04b8caff41f4 100644
--- a/metadata/md5-cache/dev-perl/Shell-Guess-0.90.0
+++ b/metadata/md5-cache/dev-perl/Shell-Guess-0.90.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Guess-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3aba8901cced388a2e103512340c82fb
+_md5_=cb09370abc972174322340f0bbee2b94
diff --git a/metadata/md5-cache/dev-perl/Signal-Mask-0.8.0 b/metadata/md5-cache/dev-perl/Signal-Mask-0.8.0
index 92a3ad032da7..e3595c2f2af6 100644
--- a/metadata/md5-cache/dev-perl/Signal-Mask-0.8.0
+++ b/metadata/md5-cache/dev-perl/Signal-Mask-0.8.0
@@ -7,7 +7,8 @@ IUSE=minimal test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Thread-SigMask ) virtual/perl-Carp dev-perl/IPC-Signal dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Signal-Mask-0.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b94ee11f9edad1a0fdc5f85c9475060c
+_md5_=dc5f2c4ee2ba43d7a748a605456548db
diff --git a/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0 b/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
index 66f63e39f795..266ee09adce3 100644
--- a/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
+++ b/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-Socket dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Socket-GetAddrInfo-0.22.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8de5c91f0ff9f7916e0979c19c2dd2f6
+_md5_=2b9c98c3edbbeead8ecc05c92def4bcf
diff --git a/metadata/md5-cache/dev-perl/Software-License-0.103.13 b/metadata/md5-cache/dev-perl/Software-License-0.103.13
index 327c97e257bf..85a41d108435 100644
--- a/metadata/md5-cache/dev-perl/Software-License-0.103.13
+++ b/metadata/md5-cache/dev-perl/Software-License-0.103.13
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Data-Section virtual/perl-File-Spec virtual/perl-IO virtual/perl-Module-Load dev-perl/Text-Template virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Software-License-0.103013.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=be3d251c4ec654cadface66cb7c08035
+_md5_=72d41abe292ffe36c4fd9ff5b2b40505
diff --git a/metadata/md5-cache/dev-perl/Sort-Versions-1.620.0 b/metadata/md5-cache/dev-perl/Sort-Versions-1.620.0
index 31a08cb38dda..091b3e2aea61 100644
--- a/metadata/md5-cache/dev-perl/Sort-Versions-1.620.0
+++ b/metadata/md5-cache/dev-perl/Sort-Versions-1.620.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Sort-Versions-1.62.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fc28d25ad46df874601c7a17762c1fc3
+_md5_=fabb7cd6cab558f24c0b8bc53d6d9e57
diff --git a/metadata/md5-cache/dev-perl/Specio-0.320.0 b/metadata/md5-cache/dev-perl/Specio-0.320.0
index 1e6f8cb81967..d2c7cea1f2c9 100644
--- a/metadata/md5-cache/dev-perl/Specio-0.320.0
+++ b/metadata/md5-cache/dev-perl/Specio-0.320.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~hppa ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Devel-StackTrace dev-perl/Eval-Closure virtual/perl-Exporter virtual/perl-IO dev-perl/MRO-Compat >=dev-perl/Role-Tiny-1.3.3 >=virtual/perl-Scalar-List-Utils-1.330.0 virtual/perl-Storable dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 virtual/perl-parent >=virtual/perl-version-0.830.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c73e9bf9983329a6a2a3cd8913012027
+_md5_=f21be86f8d5144f7ff4d372c17947c72
diff --git a/metadata/md5-cache/dev-perl/Specio-0.370.0 b/metadata/md5-cache/dev-perl/Specio-0.370.0
index 7ed49b020e1d..113dc4285cda 100644
--- a/metadata/md5-cache/dev-perl/Specio-0.370.0
+++ b/metadata/md5-cache/dev-perl/Specio-0.370.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/Ref-Util-0.112.0 ) virtual/perl-Carp dev-perl/Devel-StackTrace dev-perl/Eval-Closure virtual/perl-Exporter virtual/perl-IO dev-perl/MRO-Compat dev-perl/Module-Runtime >=dev-perl/Role-Tiny-1.3.3 >=virtual/perl-Scalar-List-Utils-1.330.0 virtual/perl-Storable dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 virtual/perl-parent >=virtual/perl-version-0.830.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b0d1ef0bb240a066002de001dcae41e7
+_md5_=2a98aabb009e1d494c13b302a8af80d7
diff --git a/metadata/md5-cache/dev-perl/Specio-0.420.0 b/metadata/md5-cache/dev-perl/Specio-0.420.0
index ee58b6415a69..b0aab0b37981 100644
--- a/metadata/md5-cache/dev-perl/Specio-0.420.0
+++ b/metadata/md5-cache/dev-perl/Specio-0.420.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/Ref-Util-0.112.0 ) virtual/perl-Carp dev-perl/Devel-StackTrace dev-perl/Eval-Closure virtual/perl-Exporter virtual/perl-IO dev-perl/MRO-Compat dev-perl/Module-Runtime >=dev-perl/Role-Tiny-1.3.3 >=virtual/perl-Scalar-List-Utils-1.330.0 virtual/perl-Storable dev-perl/Sub-Quote dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 dev-perl/Try-Tiny virtual/perl-parent >=virtual/perl-version-0.830.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.42.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=394fc30a6e467f649693ea4cc663fe96
+_md5_=1f3476a3053ff57c8cacb63215e8bcec
diff --git a/metadata/md5-cache/dev-perl/Sphinx-Config-0.100.0 b/metadata/md5-cache/dev-perl/Sphinx-Config-0.100.0
index 3f9f07460587..5073ffe4f470 100644
--- a/metadata/md5-cache/dev-perl/Sphinx-Config-0.100.0
+++ b/metadata/md5-cache/dev-perl/Sphinx-Config-0.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/List-MoreUtils virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JJ/JJSCHUTZ/Sphinx-Config-0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1e4366d8f54c76c5ee09fcb8345cf92b
+_md5_=70c2c5ca1cd659460c1a5ad90901fc6b
diff --git a/metadata/md5-cache/dev-perl/Sphinx-Search-0.310.0 b/metadata/md5-cache/dev-perl/Sphinx-Search-0.310.0
index 800023c76143..b548c869c5e5 100644
--- a/metadata/md5-cache/dev-perl/Sphinx-Search-0.310.0
+++ b/metadata/md5-cache/dev-perl/Sphinx-Search-0.310.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-Accessor dev-perl/DBI virtual/perl-Data-Dumper virtual/perl-Encode dev-perl/List-MoreUtils dev-perl/File-SearchPath virtual/perl-Scalar-List-Utils virtual/perl-Math-BigInt dev-perl/Path-Class virtual/perl-Socket dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JJ/JJSCHUTZ/Sphinx-Search-0.31.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c6cecdf0277d4e53b907b245ff1b3427
+_md5_=de029a6f86b1e56711fe6ee92db720ad
diff --git a/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0 b/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
index 8e87af29ef32..2e2b35b959fe 100644
--- a/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
+++ b/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
@@ -7,7 +7,8 @@ IUSE=test cjk unicode
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/OLE-StorageLite-0.19 dev-perl/IO-stringy dev-perl/Text-CSV_XS dev-perl/Crypt-RC4 dev-perl/Digest-Perl-MD5 unicode? ( dev-perl/Unicode-Map ) cjk? ( dev-perl/Jcode ) dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a5838000c1abef1656b0097e5f0d7c88
+_md5_=7f86f8a0473344d060e8e1548199b3a7
diff --git a/metadata/md5-cache/dev-perl/Starlet-0.310.0 b/metadata/md5-cache/dev-perl/Starlet-0.310.0
index 85a573c4a329..589c7a344920 100644
--- a/metadata/md5-cache/dev-perl/Starlet-0.310.0
+++ b/metadata/md5-cache/dev-perl/Starlet-0.310.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Parallel-Prefork-0.170.0 >=dev-perl/Plack-0.992.0 >=dev-perl/Server-Starter-0.60.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZUHO/Starlet-0.31.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a1ec96ed897ceb2a0d3dbf36a390c7bc
+_md5_=3da793b8be1e2045dd617bc67e8476ff
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.61.200 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.61.200
index b06be6d6c4a0..9429401a2254 100644
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.61.200
+++ b/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.61.200
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0612.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6a6ca712aaa7c736925d7fb07d7506b2
+_md5_=348505917d3f0a9592a374ef4e72feee
diff --git a/metadata/md5-cache/dev-perl/String-Approx-3.280.0 b/metadata/md5-cache/dev-perl/String-Approx-3.280.0
index d234e7cf227b..782c61930bdb 100644
--- a/metadata/md5-cache/dev-perl/String-Approx-3.280.0
+++ b/metadata/md5-cache/dev-perl/String-Approx-3.280.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~ppc ~ppc64 sparc x86
 LICENSE=|| ( Artistic-2 LGPL-2 )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHI/String-Approx-3.28.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4d97962a472bb5bd474ca5a970dede6b
+_md5_=230f5427a4bf04d38c401cf2766d55dc
diff --git a/metadata/md5-cache/dev-perl/String-Errf-0.8.0 b/metadata/md5-cache/dev-perl/String-Errf-0.8.0
index 2660ed2d6d32..f0be2a243d20 100644
--- a/metadata/md5-cache/dev-perl/String-Errf-0.8.0
+++ b/metadata/md5-cache/dev-perl/String-Errf-0.8.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Params-Util virtual/perl-Scalar-List-Utils >=dev-perl/String-Formatter-0.102.81 dev-perl/Sub-Exporter virtual/perl-Time-Piece virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=42a1b7758103f806a4fac55b62f7b45b
+_md5_=8fb4a0061f843ad88d130c73a8a38572
diff --git a/metadata/md5-cache/dev-perl/String-Escape-2010.2.0-r1 b/metadata/md5-cache/dev-perl/String-Escape-2010.2.0-r1
index 91134f3e7020..1cf067511903 100644
--- a/metadata/md5-cache/dev-perl/String-Escape-2010.2.0-r1
+++ b/metadata/md5-cache/dev-perl/String-Escape-2010.2.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EV/EVO/String-Escape-2010.002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5fc866e1d1fc8fd2498483620836e3ba
+_md5_=508e1faf10a102bf4c91f45168112be9
diff --git a/metadata/md5-cache/dev-perl/String-Flogger-1.101.245 b/metadata/md5-cache/dev-perl/String-Flogger-1.101.245
index f076a514a55c..7f89720e377b 100644
--- a/metadata/md5-cache/dev-perl/String-Flogger-1.101.245
+++ b/metadata/md5-cache/dev-perl/String-Flogger-1.101.245
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/JSON-MaybeXS dev-perl/Params-Util virtual/perl-Scalar-List-Utils dev-perl/Sub-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101245.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=acc282229e15bd283e3c1bfd8a41f8aa
+_md5_=b5676dfe8d6b16318528d4b80bf6c2fa
diff --git a/metadata/md5-cache/dev-perl/String-Formatter-0.102.84 b/metadata/md5-cache/dev-perl/String-Formatter-0.102.84
index 2697b59e9b34..8663fff79cea 100644
--- a/metadata/md5-cache/dev-perl/String-Formatter-0.102.84
+++ b/metadata/md5-cache/dev-perl/String-Formatter-0.102.84
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Params-Util dev-perl/Sub-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=edc6aacc786ee42c6b6f5473b0e46049
+_md5_=aff9777d0ed434c9c9456202524327ab
diff --git a/metadata/md5-cache/dev-perl/String-Print-0.920.0 b/metadata/md5-cache/dev-perl/String-Print-0.920.0
index 8071e0588305..4ad4275f74d1 100644
--- a/metadata/md5-cache/dev-perl/String-Print-0.920.0
+++ b/metadata/md5-cache/dev-perl/String-Print-0.920.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/TimeDate-2.300.0 virtual/perl-Encode dev-perl/HTML-Parser dev-perl/Unicode-LineBreak dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/String-Print-0.92.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6f43b0ae6e47c3f0f039f69e84f78944
+_md5_=cba1dd00b1e39cb87dbd41504ab07f85
diff --git a/metadata/md5-cache/dev-perl/String-Print-0.930.0 b/metadata/md5-cache/dev-perl/String-Print-0.930.0
index ed7ce8d893da..8a6bf79c7e70 100644
--- a/metadata/md5-cache/dev-perl/String-Print-0.930.0
+++ b/metadata/md5-cache/dev-perl/String-Print-0.930.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/TimeDate-2.300.0 virtual/perl-Encode dev-perl/HTML-Parser dev-perl/Unicode-LineBreak dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/String-Print-0.93.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dee38e298f767021d29f2369e49519b4
+_md5_=2b7b042764f9cdb38f236560bcdc5c02
diff --git a/metadata/md5-cache/dev-perl/String-RewritePrefix-0.7.0 b/metadata/md5-cache/dev-perl/String-RewritePrefix-0.7.0
index 56216cd25917..c4347b63c88c 100644
--- a/metadata/md5-cache/dev-perl/String-RewritePrefix-0.7.0
+++ b/metadata/md5-cache/dev-perl/String-RewritePrefix-0.7.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Sub-Exporter-0.972.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=49e983df547fd93b4d9ef0b5006dddb6
+_md5_=f14c514176beaae6dad7fd74ab4b7074
diff --git a/metadata/md5-cache/dev-perl/String-Tokenizer-0.60.0 b/metadata/md5-cache/dev-perl/String-Tokenizer-0.60.0
index 6c17204265a9..2e0260bd8989 100644
--- a/metadata/md5-cache/dev-perl/String-Tokenizer-0.60.0
+++ b/metadata/md5-cache/dev-perl/String-Tokenizer-0.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STEVAN/String-Tokenizer-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a25bc24ca6ddde39af75efe21ae98416
+_md5_=ca9922ac94d097be520466e9d7f5f472
diff --git a/metadata/md5-cache/dev-perl/String-Truncate-1.100.602 b/metadata/md5-cache/dev-perl/String-Truncate-1.100.602
index 1991c8158edc..39a1aadb00e4 100644
--- a/metadata/md5-cache/dev-perl/String-Truncate-1.100.602
+++ b/metadata/md5-cache/dev-perl/String-Truncate-1.100.602
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Sub-Exporter-0.953.0 >=dev-perl/Sub-Install-0.30.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100602.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=544273c1204ff9dac598cbfb66c89613
+_md5_=c52a5e9c2a5d0cdfaa55199b348a63a6
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.52 b/metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.52
index 29431d7bd43d..bce4e8220091 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.52
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.52
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-0.978.0 dev-perl/Sub-Name dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100052.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a56f28bf3910c0ff036f26b7967ab4ce
+_md5_=aafea21c96f178be5788cb7739fd06f0
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-GlobExporter-0.5.0 b/metadata/md5-cache/dev-perl/Sub-Exporter-GlobExporter-0.5.0
index abb0c406a275..9dbe874931d6 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-GlobExporter-0.5.0
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-GlobExporter-0.5.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Sub-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9164b1641908550ec6662b7bf01fa3b0
+_md5_=751d0590533a463ab787760d89b59902
diff --git a/metadata/md5-cache/dev-perl/Sub-Identify-0.140.0 b/metadata/md5-cache/dev-perl/Sub-Identify-0.140.0
index 9c7c4527e631..c53c7e78bf30 100644
--- a/metadata/md5-cache/dev-perl/Sub-Identify-0.140.0
+++ b/metadata/md5-cache/dev-perl/Sub-Identify-0.140.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9a27edf331fe6ad6809878dfafb6a9de
+_md5_=b81572293bcb325991084511298f2e15
diff --git a/metadata/md5-cache/dev-perl/Sub-Info-0.2.0 b/metadata/md5-cache/dev-perl/Sub-Info-0.2.0
index 904a17fd91f5..19a23f23c315 100644
--- a/metadata/md5-cache/dev-perl/Sub-Info-0.2.0
+++ b/metadata/md5-cache/dev-perl/Sub-Info-0.2.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Sub-Info-0.002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1735635991fdf0fc190acd0fdbd3fb64
+_md5_=da2b6504358cf125dce244d166802b58
diff --git a/metadata/md5-cache/dev-perl/Sub-Install-0.928.0 b/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
index 871882fd9b2b..bedde4e05454 100644
--- a/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
+++ b/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7081f50df3c718e5c0329829d0e0781d
+_md5_=86e0941c4f6f43d5d759906974a3883c
diff --git a/metadata/md5-cache/dev-perl/Sub-Name-0.150.0 b/metadata/md5-cache/dev-perl/Sub-Name-0.150.0
index a540729b286c..0e0dde1a1a41 100644
--- a/metadata/md5-cache/dev-perl/Sub-Name-0.150.0
+++ b/metadata/md5-cache/dev-perl/Sub-Name-0.150.0
@@ -7,7 +7,8 @@ IUSE=test suggested
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=581a247bfca9c7af139764ce9aa8d7ba
+_md5_=dd9ad8f34b3a59f8932e8b70a58dbcf2
diff --git a/metadata/md5-cache/dev-perl/Sub-Name-0.210.0 b/metadata/md5-cache/dev-perl/Sub-Name-0.210.0
index a987686f9bfc..ed737a264042 100644
--- a/metadata/md5-cache/dev-perl/Sub-Name-0.210.0
+++ b/metadata/md5-cache/dev-perl/Sub-Name-0.210.0
@@ -7,7 +7,8 @@ IUSE=test suggested
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=60657f0ad0a2a66676b84f5bc28626db
+_md5_=2c04ceb4276977a01651fd45c2ff2dd4
diff --git a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0 b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
index b765bf822fe9..c12a8e3a3bea 100644
--- a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
+++ b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9f2319c120c732da7e0ac1ffb06f14cd
+_md5_=a0ec4eb8d9498bb8848f7725542962eb
diff --git a/metadata/md5-cache/dev-perl/Sub-Quote-2.3.1 b/metadata/md5-cache/dev-perl/Sub-Quote-2.3.1
index ebf40d1d4c17..659affd4575c 100644
--- a/metadata/md5-cache/dev-perl/Sub-Quote-2.3.1
+++ b/metadata/md5-cache/dev-perl/Sub-Quote-2.3.1
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Moo-2.3.0 !minimal? ( >=dev-perl/Sub-Name-0.80.0 ) virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.003001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=18048606d00a268884911b56923f8896
+_md5_=e098b8e98fd8313f6c2ebdc2b7d4c57d
diff --git a/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0 b/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0
index b5b25e8ed03b..1d26bbbcd4a6 100644
--- a/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0
+++ b/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Moo-2.3.0 !minimal? ( >=dev-perl/Sub-Name-0.80.0 ) virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.004000.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=22c6779aa23c680424ca251ab05e5d62
+_md5_=0fb793098bda9da8d3026c0000905b11
diff --git a/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0 b/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0
index 0302768805f9..d3d501b0ffb6 100644
--- a/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0
+++ b/metadata/md5-cache/dev-perl/Sub-Uplevel-0.280.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f42766a11030afe6ed67cce9013361fe
+_md5_=2471646776e17912c3a08e54e1d0d5fe
diff --git a/metadata/md5-cache/dev-perl/Symbol-Global-Name-0.50.0 b/metadata/md5-cache/dev-perl/Symbol-Global-Name-0.50.0
index 357408eb7ea3..099a2da42795 100644
--- a/metadata/md5-cache/dev-perl/Symbol-Global-Name-0.50.0
+++ b/metadata/md5-cache/dev-perl/Symbol-Global-Name-0.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Symbol-Global-Name-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0ccffd3cdae6a5b88c3e9c89cfe423d1
+_md5_=1d08cbecfa7dd14f7da90a026478328d
diff --git a/metadata/md5-cache/dev-perl/Syntax-Highlight-Engine-Simple-0.101.0 b/metadata/md5-cache/dev-perl/Syntax-Highlight-Engine-Simple-0.101.0
index a9ffbfa7e133..4e864e1cecde 100644
--- a/metadata/md5-cache/dev-perl/Syntax-Highlight-Engine-Simple-0.101.0
+++ b/metadata/md5-cache/dev-perl/Syntax-Highlight-Engine-Simple-0.101.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AK/AKHUETTEL/Syntax-Highlight-Engine-Simple-0.101.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9ccea9303f1ab241c386f097e412b56d
+_md5_=a5446fe45bd4f6533e12962e1be7da1b
diff --git a/metadata/md5-cache/dev-perl/Syntax-Keyword-Junction-0.3.8-r1 b/metadata/md5-cache/dev-perl/Syntax-Keyword-Junction-0.3.8-r1
index f3db726995a9..ada3ce42c425 100644
--- a/metadata/md5-cache/dev-perl/Syntax-Keyword-Junction-0.3.8-r1
+++ b/metadata/md5-cache/dev-perl/Syntax-Keyword-Junction-0.3.8-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sub-Exporter-Progressive-0.1.6 virtual/perl-parent dev-perl/syntax dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FREW/Syntax-Keyword-Junction-0.003008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4f7dd203be41e9ca325feaf20a5d3aa7
+_md5_=9b53223aae4c5c8faa67366b295c6ee6
diff --git a/metadata/md5-cache/dev-perl/Sys-CpuLoad-0.30.0 b/metadata/md5-cache/dev-perl/Sys-CpuLoad-0.30.0
index 267b0d5040f8..8922f1e7a490 100644
--- a/metadata/md5-cache/dev-perl/Sys-CpuLoad-0.30.0
+++ b/metadata/md5-cache/dev-perl/Sys-CpuLoad-0.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLINTDW/Sys-CpuLoad-0.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=221b88b000466a9139761ba67eb1b517
+_md5_=a371954e1b839ef6e9b13c0d09d09a9e
diff --git a/metadata/md5-cache/dev-perl/Sys-Mmap-0.190.0 b/metadata/md5-cache/dev-perl/Sys-Mmap-0.190.0
index 46f89af1e78c..ee783f65e4e4 100644
--- a/metadata/md5-cache/dev-perl/Sys-Mmap-0.190.0
+++ b/metadata/md5-cache/dev-perl/Sys-Mmap-0.190.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SW/SWALTERS/Sys-Mmap-0.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=84fdac6943ba20dd96c7bd26adc5f5de
+_md5_=07fc4ded2f5f85dfe933907c828c31ea
diff --git a/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1 b/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
index b87c28cf6098..39670c8fd7de 100644
--- a/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
+++ b/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/YAML-Syck dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BL/BLOONIX/Sys-Statistics-Linux-0.66.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e67fa95c0a62a495e029c4faf4b8978c
+_md5_=cba0663f282955e145616da091d06174
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2 b/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
index 4a4db4616e2b..14b71c0cbb39 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-1.1.2 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-1.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a164e4c63c696cde2358ad4524044ba7
+_md5_=9ff20091845ed3a5da7f5d967d321cee
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9 b/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
index dd1752bd1aa0..4a128444a8cd 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-1.2.9 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-1.2.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e8e2a0f7630ce691762af6368ba6e411
+_md5_=0913f95ddf3698fb7a7eac84d25ccc79
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-1.3.2 b/metadata/md5-cache/dev-perl/Sys-Virt-1.3.2
index db2c88da610e..47a5a0665a17 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-1.3.2
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-1.3.2
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-1.3.2 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-1.3.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6ded647db43385593c60b6055359991c
+_md5_=41594d9961d50b9f979dc30b5dd1d02b
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-2.4.0 b/metadata/md5-cache/dev-perl/Sys-Virt-2.4.0
index e709edbe8b93..ee71668197cd 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-2.4.0
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-2.4.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-2.4.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-2.4.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=66041ddd48b0176a3a307f969a3d05e6
+_md5_=2c9e86ddbb8cded8bc7f073264fe9521
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-2.5.0 b/metadata/md5-cache/dev-perl/Sys-Virt-2.5.0
index 0c2d190b12a4..9a94043ccea8 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-2.5.0
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-2.5.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-2.5.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-2.5.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=50625852e6777c1b8d9cefdfc521dbf4
+_md5_=9824d8d48730bb53ddab958247435f3a
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-3.1.0 b/metadata/md5-cache/dev-perl/Sys-Virt-3.1.0
index 3283953e3078..b0bb0e7b2f4f 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-3.1.0
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-3.1.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-3.1.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-3.1.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=50625852e6777c1b8d9cefdfc521dbf4
+_md5_=9824d8d48730bb53ddab958247435f3a
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-3.3.0 b/metadata/md5-cache/dev-perl/Sys-Virt-3.3.0
index f14a4c9d2436..53647b2c10c0 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-3.3.0
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-3.3.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-3.3.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-3.3.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=50625852e6777c1b8d9cefdfc521dbf4
+_md5_=9824d8d48730bb53ddab958247435f3a
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-3.9.1 b/metadata/md5-cache/dev-perl/Sys-Virt-3.9.1
index 1b2d8cfbded0..17553c3d2ffe 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-3.9.1
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-3.9.1
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-3.9.1 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-3.9.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9247a84c8498280f9c3efdba5941b08f
+_md5_=238d6ab42c1fea136623967cc583ecc5
diff --git a/metadata/md5-cache/dev-perl/TAP-Parser-SourceHandler-pgTAP-3.330.0 b/metadata/md5-cache/dev-perl/TAP-Parser-SourceHandler-pgTAP-3.330.0
index 335fcab6010a..fac7067402cc 100644
--- a/metadata/md5-cache/dev-perl/TAP-Parser-SourceHandler-pgTAP-3.330.0
+++ b/metadata/md5-cache/dev-perl/TAP-Parser-SourceHandler-pgTAP-3.330.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Test-Harness dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.33.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1be5a21c6b989a96407daae13faf7eb2
+_md5_=d7e3e7179ad5c37bc529c1c24190727b
diff --git a/metadata/md5-cache/dev-perl/TAP-Parser-SourceHandler-pgTAP-3.340.0 b/metadata/md5-cache/dev-perl/TAP-Parser-SourceHandler-pgTAP-3.340.0
index ace7188b35e1..efac1479dde5 100644
--- a/metadata/md5-cache/dev-perl/TAP-Parser-SourceHandler-pgTAP-3.340.0
+++ b/metadata/md5-cache/dev-perl/TAP-Parser-SourceHandler-pgTAP-3.340.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Test-Harness dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.34.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f77e8183a0a8c0a1d99bd89526f40733
+_md5_=ba4f0dfd854c7ce444b9666bf7223700
diff --git a/metadata/md5-cache/dev-perl/TAP-Parser-SourceHandler-pgTAP-3.350.0 b/metadata/md5-cache/dev-perl/TAP-Parser-SourceHandler-pgTAP-3.350.0
index f95d064300e8..3840490bd8e4 100644
--- a/metadata/md5-cache/dev-perl/TAP-Parser-SourceHandler-pgTAP-3.350.0
+++ b/metadata/md5-cache/dev-perl/TAP-Parser-SourceHandler-pgTAP-3.350.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Test-Harness dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.35.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=642a56b2c11600b5c23e526df7ee0910
+_md5_=250483fbe9752406cc5c1395089e05e9
diff --git a/metadata/md5-cache/dev-perl/Taint-Util-0.80.0-r1 b/metadata/md5-cache/dev-perl/Taint-Util-0.80.0-r1
index a2860c1d4bdb..7aaa69d58c57 100644
--- a/metadata/md5-cache/dev-perl/Taint-Util-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Taint-Util-0.80.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AV/AVAR/Taint-Util-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=507d166b38f703b128ff665a5bdeacda
+_md5_=57b30b7edc1ff4de0b7845a4891121f4
diff --git a/metadata/md5-cache/dev-perl/Task-Weaken-1.50.0 b/metadata/md5-cache/dev-perl/Task-Weaken-1.50.0
index 1dc0e332471b..615a4e843c85 100644
--- a/metadata/md5-cache/dev-perl/Task-Weaken-1.50.0
+++ b/metadata/md5-cache/dev-perl/Task-Weaken-1.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm arm64 hppa ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5997633a3fccbd621155a22b37c82afb
+_md5_=b0e6191e2aba189cbfe72ee7e150abe1
diff --git a/metadata/md5-cache/dev-perl/TeX-Encode-2.4.0 b/metadata/md5-cache/dev-perl/TeX-Encode-2.4.0
index 23d765d5ad00..fc77ddccaee1 100644
--- a/metadata/md5-cache/dev-perl/TeX-Encode-2.4.0
+++ b/metadata/md5-cache/dev-perl/TeX-Encode-2.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-0.100.0 >=dev-perl/HTML-Parser-3.670.0 >=dev-perl/Pod-LaTeX-0.560.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AT/ATHREEF/TeX-Encode-2.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2195cea85932ce6e611909ef410ba85c
+_md5_=2cd3504ddb7144134f742bd813097649
diff --git a/metadata/md5-cache/dev-perl/Template-DBI-2.650.0-r2 b/metadata/md5-cache/dev-perl/Template-DBI-2.650.0-r2
index d94268bb59dc..9c7ae3f0a478 100644
--- a/metadata/md5-cache/dev-perl/Template-DBI-2.650.0-r2
+++ b/metadata/md5-cache/dev-perl/Template-DBI-2.650.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DBI-1.612 >=dev-perl/Template-Toolkit-2.22 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Template-DBI-2.65.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=19db45aa95bd24fa787812fa42e779b0
+_md5_=ae432050489b899bc5c00bf6aaf19cdc
diff --git a/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1 b/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
index 6f45098d3df8..74806912f2a5 100644
--- a/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph dev-perl/GD-Graph3d >=dev-perl/Template-Toolkit-2.15-r1 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Template-GD-2.66.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b5d6b4bd40d33d4bf2a8408adce6d618
+_md5_=81dbb88d6f95cf25754b80ca558dc9c8
diff --git a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.120.0 b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.120.0
index 2d58d65faa24..14973249b336 100644
--- a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.120.0
+++ b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/LaTeX-Driver-0.70.0 >=dev-perl/LaTeX-Encode-0.20.0 dev-perl/LaTeX-Table >=dev-perl/Template-Toolkit-2.160.0 virtual/latex-base dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EH/EHUELS/Template-Plugin-Latex-3.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c8dab6f5ede527d1709e286aa60fe8ef
+_md5_=ea549bc20e3562346f96a23508d3f154
diff --git a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0 b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
index dc7a5bd14d3e..760e6291a781 100644
--- a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
+++ b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-perl/LaTeX-Driver dev-perl/LaTeX-Encode dev-perl/LaTeX-Table >=dev-perl/Template-Toolkit-2.16 virtual/latex-base dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/Template-Plugin-Latex-3.06.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8c2aa7ea5ef501d5e7c79a4e29df5194
+_md5_=9f5ead0f2641f0f23b6ac7f914ba9a54
diff --git a/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1 b/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1
index 569b48b53a36..ceceb09ab9d7 100644
--- a/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-ma
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=dev-perl/Text-Autoformat vim-syntax? ( app-vim/tt2-syntax ) xml? ( dev-perl/Template-XML ) gd? ( dev-perl/Template-GD ) mysql? ( dev-perl/Template-DBI ) latex? ( dev-perl/Template-Plugin-Latex ) postgres? ( dev-perl/Template-DBI )
 RDEPEND=dev-perl/Text-Autoformat mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) >=dev-perl/AppConfig-1.56 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d2abc7bee58ea92c4d18b0c3369a6cf8
+_md5_=666120de076d0cc14b53eab7e40a8895
diff --git a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.170.0 b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.170.0
index afa51b22586d..c636478b1351 100644
--- a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.170.0
+++ b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.170.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-MethodMaker dev-perl/TermReadKey dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZABGAB/Term-ProgressBar-2.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c7824a9053d30d572f7e130dbdf83676
+_md5_=2d07da87880025ea15ea0d3839cbcf04
diff --git a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0 b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0
index b504246a0e9e..cf4708ac6901 100644
--- a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0
+++ b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Class-MethodMaker-1.20.0 >=dev-perl/TermReadKey-2.140.0 virtual/perl-autodie dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d0f13f3842c0973fab8fda2784343e64
+_md5_=141a32b17aa5e3288cdba987322aa96e
diff --git a/metadata/md5-cache/dev-perl/Term-ProgressBar-Quiet-0.310.0-r1 b/metadata/md5-cache/dev-perl/Term-ProgressBar-Quiet-0.310.0-r1
index a7bfda983fb7..48f12b5f821e 100644
--- a/metadata/md5-cache/dev-perl/Term-ProgressBar-Quiet-0.310.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ProgressBar-Quiet-0.310.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-Interactive dev-perl/Term-ProgressBar dev-perl/Test-MockObject dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Term-ProgressBar-Quiet-0.31.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9b8d56634d7fbef333ab5c66c433426b
+_md5_=b8aaf8f9f5b66f382b51052e6bf43f21
diff --git a/metadata/md5-cache/dev-perl/Term-Screen-1.50.0 b/metadata/md5-cache/dev-perl/Term-Screen-1.50.0
index 6043842d8e79..d822ff574fe0 100644
--- a/metadata/md5-cache/dev-perl/Term-Screen-1.50.0
+++ b/metadata/md5-cache/dev-perl/Term-Screen-1.50.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 s390 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTOWE/Term-Screen-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b2c2a9971b81b32642d45b46a4d3daa1
+_md5_=686f112796b598b90e75bc10a8ecf7f1
diff --git a/metadata/md5-cache/dev-perl/Term-Screen-1.60.0 b/metadata/md5-cache/dev-perl/Term-Screen-1.60.0
index 9299178e40d0..7f2dd056568a 100644
--- a/metadata/md5-cache/dev-perl/Term-Screen-1.60.0
+++ b/metadata/md5-cache/dev-perl/Term-Screen-1.60.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 s390 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTOWE/Term-Screen-1.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=21a389396617e027e1de380e5d878ce0
+_md5_=d2e267860cddf50f6787a6f6054d3192
diff --git a/metadata/md5-cache/dev-perl/Term-Shell-0.110.0 b/metadata/md5-cache/dev-perl/Term-Shell-0.110.0
index 9866fd75e4aa..29aff6a433bb 100644
--- a/metadata/md5-cache/dev-perl/Term-Shell-0.110.0
+++ b/metadata/md5-cache/dev-perl/Term-Shell-0.110.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper virtual/perl-File-Temp >=virtual/perl-Getopt-Long-2.360.0 virtual/perl-IO dev-perl/TermReadKey virtual/perl-Term-ReadLine dev-perl/Text-Autoformat dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a4e2a4689c5ee6047f21cacf500c89b2
+_md5_=6305b114ea4c2368586a8d75bbdfe1f3
diff --git a/metadata/md5-cache/dev-perl/Term-Shell-0.90.0 b/metadata/md5-cache/dev-perl/Term-Shell-0.90.0
index 5d7e13787290..91ffd9976486 100644
--- a/metadata/md5-cache/dev-perl/Term-Shell-0.90.0
+++ b/metadata/md5-cache/dev-perl/Term-Shell-0.90.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper virtual/perl-File-Temp >=virtual/perl-Getopt-Long-2.360.0 virtual/perl-IO dev-perl/TermReadKey virtual/perl-Term-ReadLine dev-perl/Text-Autoformat dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e960d4f252bf1676026907bf0783f7fb
+_md5_=6094b0b49eff9fec39cdcc11d26818b1
diff --git a/metadata/md5-cache/dev-perl/Term-Table-0.8.0 b/metadata/md5-cache/dev-perl/Term-Table-0.8.0
index e3ff56c91f6c..aeea102f2977 100644
--- a/metadata/md5-cache/dev-perl/Term-Table-0.8.0
+++ b/metadata/md5-cache/dev-perl/Term-Table-0.8.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.008.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=15ba62acb390e3e025127151b86f9d10
+_md5_=4303fbad19072fd2c25a7dff80eb5d55
diff --git a/metadata/md5-cache/dev-perl/Term-UI-0.460.0 b/metadata/md5-cache/dev-perl/Term-UI-0.460.0
index 06f7c3bce118..ea5b5d62125c 100644
--- a/metadata/md5-cache/dev-perl/Term-UI-0.460.0
+++ b/metadata/md5-cache/dev-perl/Term-UI-0.460.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Locale-Maketext-Simple dev-perl/Log-Message-Simple virtual/perl-Params-Check virtual/perl-Term-ReadLine virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.46.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=03650d10aa2353b87f2e5bfdb0fd7e4c
+_md5_=135a6ed1edc57ffa4781f742f5e6db82
diff --git a/metadata/md5-cache/dev-perl/Test-Base-0.880.0 b/metadata/md5-cache/dev-perl/Test-Base-0.880.0
index c09251260578..46720e862a6a 100644
--- a/metadata/md5-cache/dev-perl/Test-Base-0.880.0
+++ b/metadata/md5-cache/dev-perl/Test-Base-0.880.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Filter >=dev-perl/Spiffy-0.400.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Test-Base-0.88.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b4d125f8d9ce849a25f672243306af05
+_md5_=925b562e887065922f93399ebf0455bd
diff --git a/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0 b/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
index c1220135b032..197d1f1c2c20 100644
--- a/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
+++ b/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=413d1279c8da3d01b59a7e98a4273c23
+_md5_=e89fe3afe994a520f846ba85129ebece
diff --git a/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0 b/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
index 034c46cb1246..fe149ae35db2 100644
--- a/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
+++ b/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-2.120.920 >=dev-perl/CPAN-Meta-Check-0.7.0 >=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.010.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24979903a2ab7946a90e81b7372ae1db
+_md5_=d2bdf211c577283f0df68a20455e6568
diff --git a/metadata/md5-cache/dev-perl/Test-Class-0.500.0 b/metadata/md5-cache/dev-perl/Test-Class-0.500.0
index 6d7200532bcc..888712617d07 100644
--- a/metadata/md5-cache/dev-perl/Test-Class-0.500.0
+++ b/metadata/md5-cache/dev-perl/Test-Class-0.500.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Attribute-Handlers-0.770.0 virtual/perl-Carp virtual/perl-File-Spec >=dev-perl/MRO-Compat-0.110.0 dev-perl/Module-Runtime >=virtual/perl-Storable-2.40.0 virtual/perl-Test-Simple dev-perl/Try-Tiny dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Class-0.50.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52b62116243a7a9749228c944df6826c
+_md5_=3ff89dc72f5bb571844f05293a3b3453
diff --git a/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.220.0 b/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.220.0
index c740a89f74d1..eddbe20921ca 100644
--- a/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.220.0
+++ b/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.220.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Package-Stash-XS ) >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec dev-perl/Module-Runtime >=dev-perl/Package-Stash-0.140.0 dev-perl/Sub-Identify virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=66063a78ff118d940d177461cb5ab2da
+_md5_=b5199264461e3f766b134c2529b2bdc6
diff --git a/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.240.0 b/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.240.0
index 8b871acd4aa3..27e8dc82a335 100644
--- a/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.240.0
+++ b/metadata/md5-cache/dev-perl/Test-CleanNamespaces-0.240.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Package-Stash-XS ) >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec dev-perl/Module-Runtime >=dev-perl/Package-Stash-0.140.0 dev-perl/Sub-Identify virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3afa19c5457c5dfffbe9868e78300cd7
+_md5_=364dc488286299a7d739a0d2c1f951b2
diff --git a/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0 b/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
index 52907fe33a69..9c6e9689981e 100644
--- a/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
+++ b/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMCBRIDE/Test-Command-Simple-0.05.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ea973f95e9237c34e6181282a77fa1da
+_md5_=381594a089b4d03f056f500ff70aa8b0
diff --git a/metadata/md5-cache/dev-perl/Test-Deep-1.126.0 b/metadata/md5-cache/dev-perl/Test-Deep-1.126.0
index 543c44f842a0..57a2fd73b77f 100644
--- a/metadata/md5-cache/dev-perl/Test-Deep-1.126.0
+++ b/metadata/md5-cache/dev-perl/Test-Deep-1.126.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.90.0 virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.126.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=84ee4468fba4231d3151eeab6b3dca23
+_md5_=f418e61f3e11348d96f8b5703d2f8f1d
diff --git a/metadata/md5-cache/dev-perl/Test-Deep-1.127.0 b/metadata/md5-cache/dev-perl/Test-Deep-1.127.0
index 71568b990d6c..24ec209eac14 100644
--- a/metadata/md5-cache/dev-perl/Test-Deep-1.127.0
+++ b/metadata/md5-cache/dev-perl/Test-Deep-1.127.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.90.0 virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.127.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=17fa1fa8ec050fafa6cc8abbbcd2a120
+_md5_=effd14b1defb6654ec86c20cbf087ee4
diff --git a/metadata/md5-cache/dev-perl/Test-Deep-JSON-0.40.0 b/metadata/md5-cache/dev-perl/Test-Deep-JSON-0.40.0
index 547f454c2ee4..d63e2c35473b 100644
--- a/metadata/md5-cache/dev-perl/Test-Deep-JSON-0.40.0
+++ b/metadata/md5-cache/dev-perl/Test-Deep-JSON-0.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Exporter-Lite dev-perl/JSON dev-perl/Test-Deep dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MO/MOTEMEN/Test-Deep-JSON-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=24932ddd12ea866333e124da2ce15650
+_md5_=7560e9213d161751179be3832ba9cf5d
diff --git a/metadata/md5-cache/dev-perl/Test-Dependencies-0.230.0 b/metadata/md5-cache/dev-perl/Test-Dependencies-0.230.0
index d0456519e65b..146cd1834a22 100644
--- a/metadata/md5-cache/dev-perl/Test-Dependencies-0.230.0
+++ b/metadata/md5-cache/dev-perl/Test-Dependencies-0.230.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-CPAN-Meta dev-perl/File-Find-Rule-Perl virtual/perl-Module-CoreList dev-perl/Pod-Strip dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EH/EHUELS/Test-Dependencies-0.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=43fbc43d1c5de7ce57fe859ee1a53ea8
+_md5_=9613c276abca24752cac39f8539ee9c3
diff --git a/metadata/md5-cache/dev-perl/Test-Differences-0.640.0 b/metadata/md5-cache/dev-perl/Test-Differences-0.640.0
index 91ee639903db..574f125229b2 100644
--- a/metadata/md5-cache/dev-perl/Test-Differences-0.640.0
+++ b/metadata/md5-cache/dev-perl/Test-Differences-0.640.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Text-Diff-1.430.0 >=virtual/perl-Data-Dumper-2.126.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.64.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=55d58f5a84b71969cbd08e5eaa57fb8f
+_md5_=64d64ed4899ba9aba92b3138552a8f5d
diff --git a/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0 b/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
index 40f1606e14ec..ce748bb6fda2 100644
--- a/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
+++ b/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-ExtUtils-Manifest virtual/perl-File-Spec >=dev-perl/Module-Manifest-0.70.0 virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.014.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ba60d07939bd9f48f511ca33cbc664ce
+_md5_=2b50ab0ff7894b8994017291d03b26fe
diff --git a/metadata/md5-cache/dev-perl/Test-EOL-1.600.0 b/metadata/md5-cache/dev-perl/Test-EOL-1.600.0
index 8f0b68cc0c5f..94d012df42d8 100644
--- a/metadata/md5-cache/dev-perl/Test-EOL-1.600.0
+++ b/metadata/md5-cache/dev-perl/Test-EOL-1.600.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FREW/Test-EOL-1.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9610786b06ecd33e600832dc3e05f9c7
+_md5_=04a3f6ef68e72deff24c9a3adc1883e5
diff --git a/metadata/md5-cache/dev-perl/Test-EOL-2.0.0 b/metadata/md5-cache/dev-perl/Test-EOL-2.0.0
index 0a0de72c9f0a..d17d606b7e58 100644
--- a/metadata/md5-cache/dev-perl/Test-EOL-2.0.0
+++ b/metadata/md5-cache/dev-perl/Test-EOL-2.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-EOL-2.00.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=144191c07a50da18b73e808c17098054
+_md5_=d3890d67f9ef35f4bb7f2adc551ceec3
diff --git a/metadata/md5-cache/dev-perl/Test-FailWarnings-0.8.0-r1 b/metadata/md5-cache/dev-perl/Test-FailWarnings-0.8.0-r1
index f4583ce2b7af..467f6aacf812 100644
--- a/metadata/md5-cache/dev-perl/Test-FailWarnings-0.8.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-FailWarnings-0.8.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.860.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.008.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6f671da4e07e8f0bc9af79cff670e9e1
+_md5_=f479b0e23330e56428c234c478fbc6d8
diff --git a/metadata/md5-cache/dev-perl/Test-Fatal-0.14.0 b/metadata/md5-cache/dev-perl/Test-Fatal-0.14.0
index bf74052974d0..2f22d5175c22 100644
--- a/metadata/md5-cache/dev-perl/Test-Fatal-0.14.0
+++ b/metadata/md5-cache/dev-perl/Test-Fatal-0.14.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-Test-Simple >=dev-perl/Try-Tiny-0.70.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.014.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6bfaee312d2be030ed54114803e86e1b
+_md5_=c16c5b49cd44fbe61b39f02351913a30
diff --git a/metadata/md5-cache/dev-perl/Test-File-1.443.0 b/metadata/md5-cache/dev-perl/Test-File-1.443.0
index 934f27750f69..19df972a0671 100644
--- a/metadata/md5-cache/dev-perl/Test-File-1.443.0
+++ b/metadata/md5-cache/dev-perl/Test-File-1.443.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4c6739557f019d442fbd5fb6c53d52e8
+_md5_=5d6b66b53285c4200312d57d950bcb10
diff --git a/metadata/md5-cache/dev-perl/Test-File-Contents-0.230.0 b/metadata/md5-cache/dev-perl/Test-File-Contents-0.230.0
index aca674bc4570..d608a25face2 100644
--- a/metadata/md5-cache/dev-perl/Test-File-Contents-0.230.0
+++ b/metadata/md5-cache/dev-perl/Test-File-Contents-0.230.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.700.0 >=dev-perl/Text-Diff-0.350.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f0fda5b6eac67fecf9b673f7c2b9868a
+_md5_=d6c8a5d62db29b78033e0981ff1d56ca
diff --git a/metadata/md5-cache/dev-perl/Test-File-ShareDir-1.1.2 b/metadata/md5-cache/dev-perl/Test-File-ShareDir-1.1.2
index 3a9c5444152d..3fb6fa8c52c8 100644
--- a/metadata/md5-cache/dev-perl/Test-File-ShareDir-1.1.2
+++ b/metadata/md5-cache/dev-perl/Test-File-ShareDir-1.1.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-Tiny >=virtual/perl-Exporter-5.570.0 dev-perl/File-Copy-Recursive >=dev-perl/File-ShareDir-1.0.0 >=dev-perl/Path-Tiny-0.18.0 dev-perl/Scope-Guard virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1870c2c770648228709e4ae3ba380184
+_md5_=38a7817774227f3682dd4a7b0a1f333c
diff --git a/metadata/md5-cache/dev-perl/Test-Inline-2.213.0-r2 b/metadata/md5-cache/dev-perl/Test-Inline-2.213.0-r2
index 9f11d52e1be4..aa6df746967b 100644
--- a/metadata/md5-cache/dev-perl/Test-Inline-2.213.0-r2
+++ b/metadata/md5-cache/dev-perl/Test-Inline-2.213.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Algorithm-Dependency-1.02 >=dev-perl/Config-Tiny-2.00 >=dev-perl/File-Find-Rule-0.26 >=dev-perl/File-Flat-1.00 dev-perl/File-Remove >=dev-perl/File-Slurp-9999.04 >=virtual/perl-File-Spec-0.80 dev-perl/File-chmod >=dev-perl/Params-Util-0.05 >=dev-perl/Pod-Tests-0.18 virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Test-Inline-2.213.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f778bd2f6149553252187b4c232e1742
+_md5_=cbb36c3354dc0453b06f3984f890a297
diff --git a/metadata/md5-cache/dev-perl/Test-Inter-1.60.0 b/metadata/md5-cache/dev-perl/Test-Inter-1.60.0
index d094e301c2a8..4b0e373d3a37 100644
--- a/metadata/md5-cache/dev-perl/Test-Inter-1.60.0
+++ b/metadata/md5-cache/dev-perl/Test-Inter-1.60.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=444ceb2347e22dbf733a11df9aca203f
+_md5_=a0484d8b4870ab9703e330257a98925a
diff --git a/metadata/md5-cache/dev-perl/Test-LectroTest-0.500.100 b/metadata/md5-cache/dev-perl/Test-LectroTest-0.500.100
index 3e8700e52f14..a84b550bd97f 100644
--- a/metadata/md5-cache/dev-perl/Test-LectroTest-0.500.100
+++ b/metadata/md5-cache/dev-perl/Test-LectroTest-0.500.100
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMOERTEL/Test-LectroTest-0.5001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9390c4c09838dba91c48d0ec045b2f55
+_md5_=b4360b074fbf510b5b51c0d4ee66bf62
diff --git a/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0 b/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
index 7089e49ddd93..919da6cdacaa 100644
--- a/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
+++ b/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Test-Simple-0.950.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.02.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=461c74c54b4f47f7abe6707edfcf80d1
+_md5_=add1c1714295f31252d9065e81a43448
diff --git a/metadata/md5-cache/dev-perl/Test-MinimumVersion-0.101.82 b/metadata/md5-cache/dev-perl/Test-MinimumVersion-0.101.82
index 3fe4eff75304..742d1c535a18 100644
--- a/metadata/md5-cache/dev-perl/Test-MinimumVersion-0.101.82
+++ b/metadata/md5-cache/dev-perl/Test-MinimumVersion-0.101.82
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-CPAN-Meta virtual/perl-Exporter dev-perl/File-Find-Rule dev-perl/File-Find-Rule-Perl >=dev-perl/Perl-MinimumVersion-1.320.0 >=virtual/perl-Test-Simple-0.960.0 >=virtual/perl-version-0.700.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101082.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=728e7a0f61b8e27f2aad046399f19346
+_md5_=958cb6d5952cee30a5b24826ac9ef692
diff --git a/metadata/md5-cache/dev-perl/Test-Mock-LWP-Dispatch-0.80.0 b/metadata/md5-cache/dev-perl/Test-Mock-LWP-Dispatch-0.80.0
index d2ee37188311..38d4538feb1b 100644
--- a/metadata/md5-cache/dev-perl/Test-Mock-LWP-Dispatch-0.80.0
+++ b/metadata/md5-cache/dev-perl/Test-Mock-LWP-Dispatch-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Exporter dev-perl/HTTP-Message dev-perl/libwww-perl dev-perl/Test-MockObject dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TA/TADAM/Test-Mock-LWP-Dispatch-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bdce3d826dad367436736051e97aa624
+_md5_=88aec50c5371871b5368910bf4c0c017
diff --git a/metadata/md5-cache/dev-perl/Test-MockModule-0.110.0 b/metadata/md5-cache/dev-perl/Test-MockModule-0.110.0
index 1aefc27c5781..b745cae7a74e 100644
--- a/metadata/md5-cache/dev-perl/Test-MockModule-0.110.0
+++ b/metadata/md5-cache/dev-perl/Test-MockModule-0.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/SUPER virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f5a295832fd8d2474680009789273816
+_md5_=5a4a9c44fb9e67ae3f086e5173eed09e
diff --git a/metadata/md5-cache/dev-perl/Test-MockModule-0.130.0 b/metadata/md5-cache/dev-perl/Test-MockModule-0.130.0
index 828085c1ad16..d3d094ec5fb0 100644
--- a/metadata/md5-cache/dev-perl/Test-MockModule-0.130.0
+++ b/metadata/md5-cache/dev-perl/Test-MockModule-0.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/SUPER virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=899e4e8c75843ad1de5285d29f6b0b1c
+_md5_=57703d85cdff78f51d6711299ba8eac8
diff --git a/metadata/md5-cache/dev-perl/Test-MockObject-1.201.505.270-r1 b/metadata/md5-cache/dev-perl/Test-MockObject-1.201.505.270-r1
index 462265ead91c..cb7e3838040a 100644
--- a/metadata/md5-cache/dev-perl/Test-MockObject-1.201.505.270-r1
+++ b/metadata/md5-cache/dev-perl/Test-MockObject-1.201.505.270-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ppc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils >=dev-perl/UNIVERSAL-isa-1.201.106.140 >=dev-perl/UNIVERSAL-can-1.201.106.170 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20150527.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d28a3266dfcb8c30a2fa2ce2edebfff
+_md5_=8594a9163e67d3992518bec716a3320f
diff --git a/metadata/md5-cache/dev-perl/Test-MockObject-1.201.612.20 b/metadata/md5-cache/dev-perl/Test-MockObject-1.201.612.20
index ad1148524984..1a2a6f781dc9 100644
--- a/metadata/md5-cache/dev-perl/Test-MockObject-1.201.612.20
+++ b/metadata/md5-cache/dev-perl/Test-MockObject-1.201.612.20
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ppc sparc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils >=dev-perl/UNIVERSAL-isa-1.201.106.140 >=dev-perl/UNIVERSAL-can-1.201.106.170 virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20161202.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3dbf96cf349cbe87318fdc7c00656d14
+_md5_=81f6427e1c2fb9a03c3d82f77ab695f0
diff --git a/metadata/md5-cache/dev-perl/Test-MockRandom-1.10.0 b/metadata/md5-cache/dev-perl/Test-MockRandom-1.10.0
index ccba81b6eddb..3586f56c29c1 100644
--- a/metadata/md5-cache/dev-perl/Test-MockRandom-1.10.0
+++ b/metadata/md5-cache/dev-perl/Test-MockRandom-1.10.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-MockRandom-1.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=04264f526b41ce97176738fb6bf47d56
+_md5_=f82de1610bec6ded802b13ccfe0cc2ac
diff --git a/metadata/md5-cache/dev-perl/Test-MockTime-HiRes-0.80.0 b/metadata/md5-cache/dev-perl/Test-MockTime-HiRes-0.80.0
index 10ee48b3e88e..64d54ef695e9 100644
--- a/metadata/md5-cache/dev-perl/Test-MockTime-HiRes-0.80.0
+++ b/metadata/md5-cache/dev-perl/Test-MockTime-HiRes-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Test-MockTime virtual/perl-Test-Simple virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TA/TARAO/Test-MockTime-HiRes-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=34eba34905f8f83bf947756b1b885531
+_md5_=7c8fdf3f38acbec023fc770f26a9de16
diff --git a/metadata/md5-cache/dev-perl/Test-Needs-0.2.5 b/metadata/md5-cache/dev-perl/Test-Needs-0.2.5
index cd057388e89b..c02f3f986b3e 100644
--- a/metadata/md5-cache/dev-perl/Test-Needs-0.2.5
+++ b/metadata/md5-cache/dev-perl/Test-Needs-0.2.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fa0ba57aba9e79cda954af56c0c9e7b8
+_md5_=8bcd84865dde56cdd3c41c2e8f738250
diff --git a/metadata/md5-cache/dev-perl/Test-NoTabs-2.0.0-r1 b/metadata/md5-cache/dev-perl/Test-NoTabs-2.0.0-r1
index adfecbaa7296..c23d665df773 100644
--- a/metadata/md5-cache/dev-perl/Test-NoTabs-2.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-NoTabs-2.0.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-NoTabs-2.00.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=475d8fa88b185c7b915005e5c501b4de
+_md5_=f26945d6707b3dee992bcf9e53e4b609
diff --git a/metadata/md5-cache/dev-perl/Test-Number-Delta-1.60.0 b/metadata/md5-cache/dev-perl/Test-Number-Delta-1.60.0
index d1ae21b67686..a025fdff2245 100644
--- a/metadata/md5-cache/dev-perl/Test-Number-Delta-1.60.0
+++ b/metadata/md5-cache/dev-perl/Test-Number-Delta-1.60.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-1.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3f1e1b17cf13e0293b5584ac7cfdb7b3
+_md5_=411a52d45e326aaa057d1c6a1e89ed8f
diff --git a/metadata/md5-cache/dev-perl/Test-Object-0.80.0 b/metadata/md5-cache/dev-perl/Test-Object-0.80.0
index e4d4f974bcb5..747ac3ea88d2 100644
--- a/metadata/md5-cache/dev-perl/Test-Object-0.80.0
+++ b/metadata/md5-cache/dev-perl/Test-Object-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.160.0 virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Object-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=449f6699c24dcaee5218580b5fa7a967
+_md5_=015e9caeef941bbeb72181dd2c41a883
diff --git a/metadata/md5-cache/dev-perl/Test-Output-1.30.0 b/metadata/md5-cache/dev-perl/Test-Output-1.30.0
index bc8b74570dfe..ec3a49585c96 100644
--- a/metadata/md5-cache/dev-perl/Test-Output-1.30.0
+++ b/metadata/md5-cache/dev-perl/Test-Output-1.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Capture-Tiny-0.170.0 >=virtual/perl-File-Temp-0.170.0 dev-perl/Sub-Exporter virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e72f89f89847c8c8e60ad55e250e035
+_md5_=e4d898f49c958acc861aa12ae4de9325
diff --git a/metadata/md5-cache/dev-perl/Test-Output-1.31.0 b/metadata/md5-cache/dev-perl/Test-Output-1.31.0
index a100abfe4e74..a522cba796d1 100644
--- a/metadata/md5-cache/dev-perl/Test-Output-1.31.0
+++ b/metadata/md5-cache/dev-perl/Test-Output-1.31.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Capture-Tiny-0.170.0 >=virtual/perl-File-Temp-0.170.0 virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.031.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dc5077e0fcd28f4b59c441f5de8b6e4c
+_md5_=fcf3141eac16c576a63716a6c49c2d4a
diff --git a/metadata/md5-cache/dev-perl/Test-Pod-1.510.0 b/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
index 937b2918ead4..9164776f15f9 100644
--- a/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
+++ b/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Pod-Simple-3.50.0 >=virtual/perl-Test-Simple-0.620.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Pod-1.51.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=989535d159b08b10de874598900f16ae
+_md5_=599401a72f5704820065558242d453ff
diff --git a/metadata/md5-cache/dev-perl/Test-Pod-Coverage-1.100.0 b/metadata/md5-cache/dev-perl/Test-Pod-Coverage-1.100.0
index cae66219e358..ad0303428326 100644
--- a/metadata/md5-cache/dev-perl/Test-Pod-Coverage-1.100.0
+++ b/metadata/md5-cache/dev-perl/Test-Pod-Coverage-1.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Test-Simple dev-perl/Pod-Coverage dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Test-Pod-Coverage-1.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=481299fb4d2716d1cc2d3dff35e1d639
+_md5_=2cdf30e6a7184636c486f48b3eb1b96b
diff --git a/metadata/md5-cache/dev-perl/Test-Portability-Files-0.90.0 b/metadata/md5-cache/dev-perl/Test-Portability-Files-0.90.0
index 0433f5478cd0..88aa9d126a85 100644
--- a/metadata/md5-cache/dev-perl/Test-Portability-Files-0.90.0
+++ b/metadata/md5-cache/dev-perl/Test-Portability-Files-0.90.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=90b3976cb179366bb23e545aadfe20ea
+_md5_=f738725541ce33caf7264e281a3b6b4c
diff --git a/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0 b/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0
index feaef44e29ed..73e45058a276 100644
--- a/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0
+++ b/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=virtual/perl-Test-Simple virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Test-Regexp-2017040101.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c5be20279756fa9c70d906b27d45c835
+_md5_=1b4be0bcec1e756aa6ef7ad54ab21ce6
diff --git a/metadata/md5-cache/dev-perl/Test-RequiresInternet-0.50.0 b/metadata/md5-cache/dev-perl/Test-RequiresInternet-0.50.0
index 556dc86edb46..e0a9b7d2c7d1 100644
--- a/metadata/md5-cache/dev-perl/Test-RequiresInternet-0.50.0
+++ b/metadata/md5-cache/dev-perl/Test-RequiresInternet-0.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Socket dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c19d8e9192235f605f12b77ae4997767
+_md5_=9bd9c0d46a3849277ee17427ecd825b7
diff --git a/metadata/md5-cache/dev-perl/Test-Script-1.230.0 b/metadata/md5-cache/dev-perl/Test-Script-1.230.0
index fb34d87f4409..1cfb462a39c1 100644
--- a/metadata/md5-cache/dev-perl/Test-Script-1.230.0
+++ b/metadata/md5-cache/dev-perl/Test-Script-1.230.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny >=virtual/perl-File-Spec-0.800.0 virtual/perl-IO >=dev-perl/Probe-Perl-0.10.0 >=virtual/perl-Test-Simple-1.302.15 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=44fd662b5b9a7ded0cb8fbf8a9f1f31f
+_md5_=7d5bc2d0bc955770a214ae19c99cb994
diff --git a/metadata/md5-cache/dev-perl/Test-SharedFork-0.350.0 b/metadata/md5-cache/dev-perl/Test-SharedFork-0.350.0
index 69f0eeef6e9d..d84e3651674d 100644
--- a/metadata/md5-cache/dev-perl/Test-SharedFork-0.350.0
+++ b/metadata/md5-cache/dev-perl/Test-SharedFork-0.350.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp >=virtual/perl-Test-Simple-0.880.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Test-SharedFork-0.35.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e3d92314139422957df7ec17b73bada3
+_md5_=25c57a8f4a6316d1bdff390264b9be70
diff --git a/metadata/md5-cache/dev-perl/Test-Spec-0.540.0 b/metadata/md5-cache/dev-perl/Test-Spec-0.540.0
index 5d1b109a0d18..3682bf51b7b1 100644
--- a/metadata/md5-cache/dev-perl/Test-Spec-0.540.0
+++ b/metadata/md5-cache/dev-perl/Test-Spec-0.540.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Package-Stash-0.230.0 >=virtual/perl-Scalar-List-Utils-1.110.0 >=dev-perl/Test-Deep-0.103.0 virtual/perl-Test-Harness >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Trap dev-perl/Tie-IxHash dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AK/AKZHAN/Test-Spec-0.54.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=de63b148871f555f3dd60e4669720f4e
+_md5_=e88d755362e5d9d7aeca32a77e523a76
diff --git a/metadata/md5-cache/dev-perl/Test-Strict-0.470.0 b/metadata/md5-cache/dev-perl/Test-Strict-0.470.0
index d4449f45265c..da2dc88a3b60 100644
--- a/metadata/md5-cache/dev-perl/Test-Strict-0.470.0
+++ b/metadata/md5-cache/dev-perl/Test-Strict-0.470.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/Test-Strict-0.47.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6f1ec1988c1c742a6cf402b5e5de9ca7
+_md5_=2941d0bd6ff3fef1738f5fab553f5330
diff --git a/metadata/md5-cache/dev-perl/Test-TCP-2.190.0-r1 b/metadata/md5-cache/dev-perl/Test-TCP-2.190.0-r1
index d788875404b3..7c695b6c8004 100644
--- a/metadata/md5-cache/dev-perl/Test-TCP-2.190.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-TCP-2.190.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO virtual/perl-IO-Socket-IP >=dev-perl/Test-SharedFork-0.290.0 virtual/perl-Test-Simple >=virtual/perl-IO-1.230.0 virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-TCP-2.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f3ab42c8a3101ca4c0732962c08f2c7d
+_md5_=df797808a9fce38d98d6883210deae50
diff --git a/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1 b/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
index f355849cd50b..7458266c2162 100644
--- a/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Test-Taint-1.06.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f1452648e5e94a5cd0c0fdb050ec44db
+_md5_=beb8327ba638f6152dd0fa8cd5fc84e4
diff --git a/metadata/md5-cache/dev-perl/Test-TempDir-Tiny-0.17.0 b/metadata/md5-cache/dev-perl/Test-TempDir-Tiny-0.17.0
index b3abb48796f6..c79ba276da77 100644
--- a/metadata/md5-cache/dev-perl/Test-TempDir-Tiny-0.17.0
+++ b/metadata/md5-cache/dev-perl/Test-TempDir-Tiny-0.17.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 >=virtual/perl-File-Path-2.70.0 virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.017.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=92bb4f6d5dd3faacf9ba6983d62deeb5
+_md5_=45005ff0ac9f9e2574fa8f075c50bcb5
diff --git a/metadata/md5-cache/dev-perl/Test-Timer-2.100.0 b/metadata/md5-cache/dev-perl/Test-Timer-2.100.0
index 6e53b7cfa96d..7bed70e01999 100644
--- a/metadata/md5-cache/dev-perl/Test-Timer-2.100.0
+++ b/metadata/md5-cache/dev-perl/Test-Timer-2.100.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp dev-perl/Error virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JO/JONASBN/Test-Timer-2.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e9b0582a97500426d1f4799c9b7af402
+_md5_=88f9b5628b0d82581dfdd27574fcf675
diff --git a/metadata/md5-cache/dev-perl/Test-Trap-0.3.3 b/metadata/md5-cache/dev-perl/Test-Trap-0.3.3
index 77a41f37f5e0..980358f3bca8 100644
--- a/metadata/md5-cache/dev-perl/Test-Trap-0.3.3
+++ b/metadata/md5-cache/dev-perl/Test-Trap-0.3.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Data-Dump virtual/perl-Exporter virtual/perl-File-Temp virtual/perl-IO virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.3.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a356a66ab23f91200ca2c3b862d56c51
+_md5_=26039a24f1d26363e831d0972cbf7382
diff --git a/metadata/md5-cache/dev-perl/Test-Version-2.70.0 b/metadata/md5-cache/dev-perl/Test-Version-2.70.0
index 301342863048..0fe793a48303 100644
--- a/metadata/md5-cache/dev-perl/Test-Version-2.70.0
+++ b/metadata/md5-cache/dev-perl/Test-Version-2.70.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/File-Find-Rule-Perl >=virtual/perl-Module-Metadata-1.0.20 >=virtual/perl-Test-Simple-0.940.0 virtual/perl-parent >=virtual/perl-version-0.860.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Test-Version-2.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=155b7f3d7d3a140823519caf51b20101
+_md5_=c78d9247780b90f575b7a4f2db55afa1
diff --git a/metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.440.0-r1 b/metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.440.0-r1
index ca8f8a4b45dc..6723df3f574d 100644
--- a/metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.440.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.440.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/WWW-Mechanize-1.680.0 dev-perl/Carp-Assert-More dev-perl/URI >=dev-perl/Test-LongString-0.150.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.44.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=317ff8739120c86c7261a253074fc9da
+_md5_=cc265165e8116fd1bcaa280c0bab087f
diff --git a/metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.480.0 b/metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.480.0
index d7f63b3ac1c7..2c9b49939c52 100644
--- a/metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.480.0
+++ b/metadata/md5-cache/dev-perl/Test-WWW-Mechanize-1.480.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=Artistic-2
 RDEPEND=dev-perl/Carp-Assert-More dev-perl/HTML-Parser >=dev-perl/libwww-perl-6.200.0 >=dev-perl/Test-LongString-0.150.0 >=virtual/perl-Test-Simple-0.960.0 dev-perl/URI >=dev-perl/WWW-Mechanize-1.680.0 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.48.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3182a9f1a629709890b11c832524cc5f
+_md5_=2d8454eeba6e142bf610f5851b44bb91
diff --git a/metadata/md5-cache/dev-perl/Test-Warn-0.320.0 b/metadata/md5-cache/dev-perl/Test-Warn-0.320.0
index ec4484bbb89b..f9777a5fb92f 100644
--- a/metadata/md5-cache/dev-perl/Test-Warn-0.320.0
+++ b/metadata/md5-cache/dev-perl/Test-Warn-0.320.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Carp-1.220.0 >=dev-perl/Sub-Uplevel-0.120.0 >=virtual/perl-Test-Simple-0.880.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=35c74cb25c32acc3a2e902d75996562b
+_md5_=37d4768f593f1ab620b9464d3f202eab
diff --git a/metadata/md5-cache/dev-perl/Test-Warnings-0.16.0 b/metadata/md5-cache/dev-perl/Test-Warnings-0.16.0
index 7213d342d0a9..e93aac0b7140 100644
--- a/metadata/md5-cache/dev-perl/Test-Warnings-0.16.0
+++ b/metadata/md5-cache/dev-perl/Test-Warnings-0.16.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-Test-Simple virtual/perl-parent dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.016.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a314d0d213e808d08a27d99c0a2f01f9
+_md5_=da0cb27f8757cd9d44bfa716b0bef58e
diff --git a/metadata/md5-cache/dev-perl/Test-Warnings-0.26.0 b/metadata/md5-cache/dev-perl/Test-Warnings-0.26.0
index a5cdf1c940b5..4db6fd0bffc8 100644
--- a/metadata/md5-cache/dev-perl/Test-Warnings-0.26.0
+++ b/metadata/md5-cache/dev-perl/Test-Warnings-0.26.0
@@ -7,7 +7,8 @@ IUSE=test suggested
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/File-pushd-1.4.0 virtual/perl-Carp virtual/perl-Exporter virtual/perl-Test-Simple virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.026.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0e4c2ca811081da2695d723dbaabb2b8
+_md5_=05413a4a53f37c623f69ea562e0a1a0e
diff --git a/metadata/md5-cache/dev-perl/Test-Without-Module-0.200.0 b/metadata/md5-cache/dev-perl/Test-Without-Module-0.200.0
index 80be17720059..ff63f6eb74af 100644
--- a/metadata/md5-cache/dev-perl/Test-Without-Module-0.200.0
+++ b/metadata/md5-cache/dev-perl/Test-Without-Module-0.200.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c5df0dc97646d4edc683b714d8134194
+_md5_=e7d2d7af39b6f169df325135d8b2c75b
diff --git a/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.60.0 b/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.60.0
index 9dbde5b9aeb5..5c3ecef86029 100644
--- a/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.60.0
+++ b/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Test-Simple-1.302.15 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9123568677643c101463ad76e1ea97c6
+_md5_=93a8f5a08a032dd3b29433bb2c8d1ba8
diff --git a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77 b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
index cdec15b12ec2..1e29dc0ecc89 100644
--- a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
+++ b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Info-0.1.0 >=dev-perl/Term-Table-0.2.0 >=virtual/perl-Test-Simple-1.302.73 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000077.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c2dd9df1a4ba587f42ef1e33eaad10f9
+_md5_=778a96a0b47288869d56ae8a660a4191
diff --git a/metadata/md5-cache/dev-perl/Text-Aligner-0.130.0 b/metadata/md5-cache/dev-perl/Text-Aligner-0.130.0
index 4e41948b8ac3..4949f136af86 100644
--- a/metadata/md5-cache/dev-perl/Text-Aligner-0.130.0
+++ b/metadata/md5-cache/dev-perl/Text-Aligner-0.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=virtual/perl-Exporter >=virtual/perl-Term-ANSIColor-2.20.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a745805925b1185f1f7d185ac2983a98
+_md5_=2d27cacb0f1526376b54c0ac893754bf
diff --git a/metadata/md5-cache/dev-perl/Text-Autoformat-1.740.0 b/metadata/md5-cache/dev-perl/Text-Autoformat-1.740.0
index d88c120c1c67..047c5defbe18 100644
--- a/metadata/md5-cache/dev-perl/Text-Autoformat-1.740.0
+++ b/metadata/md5-cache/dev-perl/Text-Autoformat-1.740.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/Text-Reform virtual/perl-Text-Tabs+Wrap dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.74.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f6c923491566cbbd17e110e843c5cfd7
+_md5_=ec51803f34caaf556b549f9d7704bf85
diff --git a/metadata/md5-cache/dev-perl/Text-BibTeX-0.850.0 b/metadata/md5-cache/dev-perl/Text-BibTeX-0.850.0
index 2e4438c872e2..3a98ceeef422 100644
--- a/metadata/md5-cache/dev-perl/Text-BibTeX-0.850.0
+++ b/metadata/md5-cache/dev-perl/Text-BibTeX-0.850.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!dev-libs/btparse virtual/perl-Encode virtual/perl-Scalar-List-Utils virtual/perl-Unicode-Normalize dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.85.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f28bb86cf817debce8720c09391eabb5
+_md5_=15547d9c2a928212281758b3a0ab8cfa
diff --git a/metadata/md5-cache/dev-perl/Text-BibTeX-0.880.0 b/metadata/md5-cache/dev-perl/Text-BibTeX-0.880.0
index dd93c0a56ff8..98ef45ca18f7 100644
--- a/metadata/md5-cache/dev-perl/Text-BibTeX-0.880.0
+++ b/metadata/md5-cache/dev-perl/Text-BibTeX-0.880.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!dev-libs/btparse virtual/perl-Encode virtual/perl-Scalar-List-Utils virtual/perl-Unicode-Normalize dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=47dadfd9c2bda6c9e5be0af2021e76a9
+_md5_=ee01407e5af0ae7113bb2ebdfc28d5a5
diff --git a/metadata/md5-cache/dev-perl/Text-CSV-1.940.0 b/metadata/md5-cache/dev-perl/Text-CSV-1.940.0
index 941419f91cee..2bc7e2036a3e 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV-1.940.0
+++ b/metadata/md5-cache/dev-perl/Text-CSV-1.940.0
@@ -7,7 +7,8 @@ IUSE=test +xs
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=xs? ( >=dev-perl/Text-CSV_XS-1.20.0 ) virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.94.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=21b673d8f4aff0eb821eac83929e90a4
+_md5_=bcbbaf9f0ad5b10e621a325955d55308
diff --git a/metadata/md5-cache/dev-perl/Text-CSV-1.950.0 b/metadata/md5-cache/dev-perl/Text-CSV-1.950.0
index 7203cfb516d0..f7c975d99ec0 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV-1.950.0
+++ b/metadata/md5-cache/dev-perl/Text-CSV-1.950.0
@@ -7,7 +7,8 @@ IUSE=test +xs
 KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=xs? ( >=dev-perl/Text-CSV_XS-1.20.0 ) virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.95.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dab5621e73d82b737422fb1a5da98521
+_md5_=633ebe5b9470196c6c8dd324b8e7970b
diff --git a/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1 b/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
index b20a0bcb9910..13bc44ac80a7 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~mips ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( GPL-3 GPL-2 )
 RDEPEND=dev-perl/Text-CSV_XS dev-perl/Class-Trigger dev-perl/File-Slurp dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Text-CSV-Simple-1.00.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a81b453c90608b1da5b524a604dec52
+_md5_=ad533bd7bcd26c2cc6b2eee70d671128
diff --git a/metadata/md5-cache/dev-perl/Text-CSV_XS-1.340.0 b/metadata/md5-cache/dev-perl/Text-CSV_XS-1.340.0
index 7f2f89fcc09b..b80fdace027c 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV_XS-1.340.0
+++ b/metadata/md5-cache/dev-perl/Text-CSV_XS-1.340.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.34.tgz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d0b0ffd1a5cd81b11830ac7156188c40
+_md5_=003ef93229668f692522e396edad08e7
diff --git a/metadata/md5-cache/dev-perl/Text-FindIndent-0.110.0 b/metadata/md5-cache/dev-perl/Text-FindIndent-0.110.0
index 502f46af48c9..3b65a7f1669d 100644
--- a/metadata/md5-cache/dev-perl/Text-FindIndent-0.110.0
+++ b/metadata/md5-cache/dev-perl/Text-FindIndent-0.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Text-FindIndent-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=eebedb363617915c25abeea4c7520b15
+_md5_=af0c388180284b1be78bb909d42352f5
diff --git a/metadata/md5-cache/dev-perl/Text-Format-0.590.0 b/metadata/md5-cache/dev-perl/Text-Format-0.590.0
index 26a09e9e8971..5fa65b3a773b 100644
--- a/metadata/md5-cache/dev-perl/Text-Format-0.590.0
+++ b/metadata/md5-cache/dev-perl/Text-Format-0.590.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.59.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91284ab5c4a9d8f3200ed571f5dbddd5
+_md5_=60d5ebbeb7a9ec19612df698d16cef1d
diff --git a/metadata/md5-cache/dev-perl/Text-Format-0.600.0 b/metadata/md5-cache/dev-perl/Text-Format-0.600.0
index cbd7a26fdf70..171aeb7e30c3 100644
--- a/metadata/md5-cache/dev-perl/Text-Format-0.600.0
+++ b/metadata/md5-cache/dev-perl/Text-Format-0.600.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.60.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=acce6533430ee353aebaf72943ef2e58
+_md5_=3cc2cf8e212dacea32749dbabdf44741
diff --git a/metadata/md5-cache/dev-perl/Text-Glob-0.110.0 b/metadata/md5-cache/dev-perl/Text-Glob-0.110.0
index 54db851925eb..307fe4320b96 100644
--- a/metadata/md5-cache/dev-perl/Text-Glob-0.110.0
+++ b/metadata/md5-cache/dev-perl/Text-Glob-0.110.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=476bbd854f8538be07a71a967e5f9c79
+_md5_=62a1f713a25ffb15aa549da534b6e651
diff --git a/metadata/md5-cache/dev-perl/Text-Levenshtein-0.130.0 b/metadata/md5-cache/dev-perl/Text-Levenshtein-0.130.0
index 5b0047420004..83e4a6e48cc8 100644
--- a/metadata/md5-cache/dev-perl/Text-Levenshtein-0.130.0
+++ b/metadata/md5-cache/dev-perl/Text-Levenshtein-0.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils >=virtual/perl-Unicode-Collate-1.40.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Text-Levenshtein-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d78709cb06388c5e472a565a764d6deb
+_md5_=8724fc49537d46f839683485eac2a039
diff --git a/metadata/md5-cache/dev-perl/Text-Markdown-1.0.31-r1 b/metadata/md5-cache/dev-perl/Text-Markdown-1.0.31-r1
index 5964a5db349d..6dff06cb0e60 100644
--- a/metadata/md5-cache/dev-perl/Text-Markdown-1.0.31-r1
+++ b/metadata/md5-cache/dev-perl/Text-Markdown-1.0.31-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-Text-Balanced dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b9f8e3c6414dde719b69719a85d58f2f
+_md5_=1155ccbb5bcb4d5e29028a9010462690
diff --git a/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1 b/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
index b87d6bbd14dc..b345d4ad3c16 100644
--- a/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSIBLEY/Text-Password-Pronounceable-0.30.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=47c2b2965c3323313d459f352e8ad5f5
+_md5_=560b24f9cd224701f001c775cc7c0594
diff --git a/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1 b/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
index 830cadd4ac40..7b93242d0868 100644
--- a/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=31886733a7686b09156af78ba4031c71
+_md5_=cf29660d913cf9fb79cdc0348e93d05b
diff --git a/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0 b/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0
index 085452c2c64c..e74c7ddf16cb 100644
--- a/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0
+++ b/metadata/md5-cache/dev-perl/Text-Soundex-3.50.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Text-Unidecode ) virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=132d417782aef3168cb3c097c7123324
+_md5_=2e8e8c1da74f0583d871e59d20485290
diff --git a/metadata/md5-cache/dev-perl/Text-Table-1.133.0 b/metadata/md5-cache/dev-perl/Text-Table-1.133.0
index df08732b49a1..509072b1a0e0 100644
--- a/metadata/md5-cache/dev-perl/Text-Table-1.133.0
+++ b/metadata/md5-cache/dev-perl/Text-Table-1.133.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils >=dev-perl/Text-Aligner-0.50.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.133.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8f964c0da06891db009e88fac93ee5c4
+_md5_=8485940b187aef60cfeabb6d8c076dea
diff --git a/metadata/md5-cache/dev-perl/Text-Template-1.510.0 b/metadata/md5-cache/dev-perl/Text-Template-1.510.0
index 85717aa7abcb..e76d4eecf404 100644
--- a/metadata/md5-cache/dev-perl/Text-Template-1.510.0
+++ b/metadata/md5-cache/dev-perl/Text-Template-1.510.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ppc x86 ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.51.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2ce2353b6019d1dd7862ec4bed4f4e2a
+_md5_=469ffc23e1700655418bbcd435c2f1ae
diff --git a/metadata/md5-cache/dev-perl/Text-Template-1.530.0 b/metadata/md5-cache/dev-perl/Text-Template-1.530.0
index 903165c87c5d..f79c3aa4ea42 100644
--- a/metadata/md5-cache/dev-perl/Text-Template-1.530.0
+++ b/metadata/md5-cache/dev-perl/Text-Template-1.530.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.53.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9b5f6505a84e659a08ee0aa45088f7d1
+_md5_=11751d9492755b0a4d86ee23e5ae0fc6
diff --git a/metadata/md5-cache/dev-perl/Text-VimColor-0.280.0 b/metadata/md5-cache/dev-perl/Text-VimColor-0.280.0
index 4b90bedd74bb..1f5b71570629 100644
--- a/metadata/md5-cache/dev-perl/Text-VimColor-0.280.0
+++ b/metadata/md5-cache/dev-perl/Text-VimColor-0.280.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-editors/vim[-minimal] virtual/perl-Carp dev-perl/File-ShareDir virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-IO >=dev-perl/Path-Class-0.40.0 >=virtual/perl-Term-ANSIColor-1.30.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RW/RWSTAUNER/Text-VimColor-0.28.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=77823566ae53301f1129dc32e6838be7
+_md5_=0f8cfc11afe357710a3bd7fcd02b7c2e
diff --git a/metadata/md5-cache/dev-perl/Text-VimColor-0.290.0-r1 b/metadata/md5-cache/dev-perl/Text-VimColor-0.290.0-r1
index 299e8a9f1abb..ea979c10919d 100644
--- a/metadata/md5-cache/dev-perl/Text-VimColor-0.290.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-VimColor-0.290.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-editors/vim[-minimal] virtual/perl-Carp dev-perl/File-ShareDir virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-IO >=dev-perl/Path-Class-0.40.0 >=virtual/perl-Term-ANSIColor-1.30.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RW/RWSTAUNER/Text-VimColor-0.29.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e1e17486465c8713bbda3e2948265e64
+_md5_=cd9068baf8bef40074195d13ded01660
diff --git a/metadata/md5-cache/dev-perl/Text-Wrapper-1.50.0 b/metadata/md5-cache/dev-perl/Text-Wrapper-1.50.0
index 50714b699e50..59593566d488 100644
--- a/metadata/md5-cache/dev-perl/Text-Wrapper-1.50.0
+++ b/metadata/md5-cache/dev-perl/Text-Wrapper-1.50.0
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Text-Wrapper-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7e8886bd25295173451064958c17c641
+_md5_=d9ae0acf7ad5e0c3bef632bbe2533b14
diff --git a/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0 b/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
index ff69b7fa06e2..d6f81f8b8276 100644
--- a/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
+++ b/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor-Chained dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=235942f4429cbeea1ace98e8f2ac43cc
+_md5_=7dc6db2c2d95e85f3cc57765c83e5d5c
diff --git a/metadata/md5-cache/dev-perl/Thread-SigMask-0.4.0 b/metadata/md5-cache/dev-perl/Thread-SigMask-0.4.0
index a505d96edd42..c02afea80982 100644
--- a/metadata/md5-cache/dev-perl/Thread-SigMask-0.4.0
+++ b/metadata/md5-cache/dev-perl/Thread-SigMask-0.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Thread-SigMask-0.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=473cbc29578d989cc3cd98217c53ff6c
+_md5_=d0f3d6b6f5ff09654f306176f49a178f
diff --git a/metadata/md5-cache/dev-perl/Throwable-0.200.13 b/metadata/md5-cache/dev-perl/Throwable-0.200.13
index e34942478629..5495e0d66096 100644
--- a/metadata/md5-cache/dev-perl/Throwable-0.200.13
+++ b/metadata/md5-cache/dev-perl/Throwable-0.200.13
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Devel-StackTrace-1.320.0 >=dev-perl/Module-Runtime-0.2.0 >=dev-perl/Moo-1.0.1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Throwable-0.200013.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1766a681eee6fc6d74b568b5a8ac28a3
+_md5_=6e3f779668cc1ba4ee40059e5e0c6013
diff --git a/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1 b/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
index bc4b48d07f0f..4acd4d95bf49 100644
--- a/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ia64 ~ppc sparc x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Tie-Array-Sorted-1.41.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=40ccd2db617bd37e8c5c786f7154083d
+_md5_=a5805128cbcba8d239b3107fd32f42cf
diff --git a/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0 b/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
index 0f92554bb235..2bee762484ce 100644
--- a/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
+++ b/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Tie-CPHash-2.000.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=767220c238e38996f1a382c6c16ce477
+_md5_=2bc27b74a264ab515be5ffb6e8d230d5
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0 b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
index fe68a169b2b7..80bde5f86e6b 100644
--- a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
+++ b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/enum dev-perl/Carp-Assert dev-perl/Class-Virtual dev-perl/Class-Data-Inheritable dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Tie-Cache-LRU-20150301.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bae52efb7b36e6834e445f1871352fc1
+_md5_=7613cab61d45583ac61ad9863e1bacce
diff --git a/metadata/md5-cache/dev-perl/Tie-Cycle-1.225.0 b/metadata/md5-cache/dev-perl/Tie-Cycle-1.225.0
index b45d56bf59b1..5ebf8d353bb4 100644
--- a/metadata/md5-cache/dev-perl/Tie-Cycle-1.225.0
+++ b/metadata/md5-cache/dev-perl/Tie-Cycle-1.225.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.225.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2cf333f57ccb525f6293c2c482b5843b
+_md5_=73c25e7cdc94c92912441b43943d8e2f
diff --git a/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0 b/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
index 789743acb78d..9b56df2669db 100644
--- a/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
+++ b/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Tie-Hash-Method-0.02.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=661428604c56526a850bf7f204d2e029
+_md5_=1cd9780395d65b7ff1f68537ade7705a
diff --git a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0 b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
index 8d4eae60b57c..33dd39d2a4fa 100644
--- a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
+++ b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=71a2987b2781bb8088ddebd907c4bdb9
+_md5_=3aa1b93210dfede026975bd1cb3abaa3
diff --git a/metadata/md5-cache/dev-perl/Tie-LLHash-1.4.0 b/metadata/md5-cache/dev-perl/Tie-LLHash-1.4.0
index 2b6e9698298d..2c0a66cc3678 100644
--- a/metadata/md5-cache/dev-perl/Tie-LLHash-1.4.0
+++ b/metadata/md5-cache/dev-perl/Tie-LLHash-1.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAERXESS/Tie-LLHash-1.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=594b1359c85b458f8863198afa211fc4
+_md5_=c556ddcc4da0f1d6d2cc80ee22f30f5e
diff --git a/metadata/md5-cache/dev-perl/Tie-Simple-1.40.0 b/metadata/md5-cache/dev-perl/Tie-Simple-1.40.0
index f695a63de2a7..2c54e7b375d0 100644
--- a/metadata/md5-cache/dev-perl/Tie-Simple-1.40.0
+++ b/metadata/md5-cache/dev-perl/Tie-Simple-1.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HANENKAMP/Tie-Simple-1.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4925eed81830cc3160aa4f8a657ec9c4
+_md5_=6dfbc21a48201126375735168397850e
diff --git a/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1 b/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
index abbc81cd79ee..6640a82b5b72 100644
--- a/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Params-Validate dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=83762f8734dffcda322bb094de47855b
+_md5_=b41c1d018eefca992e5c48a6450c65c1
diff --git a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1 b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
index a745aa19c633..ff0277be566c 100644
--- a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aa1abbb21271e520f6f20eb9242480bf
+_md5_=bd9154c9841596788d5acabee1ae96da
diff --git a/metadata/md5-cache/dev-perl/Time-Duration-1.200.0 b/metadata/md5-cache/dev-perl/Time-Duration-1.200.0
index e5229a31e6af..238f89e8974d 100644
--- a/metadata/md5-cache/dev-perl/Time-Duration-1.200.0
+++ b/metadata/md5-cache/dev-perl/Time-Duration-1.200.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-1.20.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=de7c8e26761c2cd40bc16396d171119a
+_md5_=ce9670fe9f60ce65b703098c3763a40c
diff --git a/metadata/md5-cache/dev-perl/Time-Duration-Parse-0.130.0 b/metadata/md5-cache/dev-perl/Time-Duration-Parse-0.130.0
index c7d61c3a5ce5..82811463aeeb 100644
--- a/metadata/md5-cache/dev-perl/Time-Duration-Parse-0.130.0
+++ b/metadata/md5-cache/dev-perl/Time-Duration-Parse-0.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Exporter-Lite dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3e2b22480ae6bf524a658ccec41f54ab
+_md5_=737a4f6f1c079472eaa7132ecd66fe0f
diff --git a/metadata/md5-cache/dev-perl/Time-Format-1.120.0-r1 b/metadata/md5-cache/dev-perl/Time-Format-1.120.0-r1
index 1a29b67ff7de..31197165b323 100644
--- a/metadata/md5-cache/dev-perl/Time-Format-1.120.0-r1
+++ b/metadata/md5-cache/dev-perl/Time-Format-1.120.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Time-Format
 RDEPEND=dev-perl/Date-Manip >=virtual/perl-Time-Local-1.70.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROODE/Time-Format-1.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=99a006160b7d53ccee43cf9069ac2bc5
+_md5_=7749aeb83ac0c2f4602f384bbf7c78ad
diff --git a/metadata/md5-cache/dev-perl/Time-Moment-0.430.0 b/metadata/md5-cache/dev-perl/Time-Moment-0.430.0
index 24226ca55ea2..88459e530463 100644
--- a/metadata/md5-cache/dev-perl/Time-Moment-0.430.0
+++ b/metadata/md5-cache/dev-perl/Time-Moment-0.430.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Time-HiRes >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHANSEN/Time-Moment-0.43.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8d83843ae6abdea524586604fe61e3c5
+_md5_=f8cc8a765d16be2bad80e8ba9db3c1e6
diff --git a/metadata/md5-cache/dev-perl/Time-Monotonic-0.9.8 b/metadata/md5-cache/dev-perl/Time-Monotonic-0.9.8
index e3cdbb68a2e2..48769c9ccd38 100644
--- a/metadata/md5-cache/dev-perl/Time-Monotonic-0.9.8
+++ b/metadata/md5-cache/dev-perl/Time-Monotonic-0.9.8
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVID/Time-Monotonic-v0.9.8.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2be1f41df75a632676cd57d95b0868cb
+_md5_=72e85a950a3e6247ebaf9b59d2d4a07d
diff --git a/metadata/md5-cache/dev-perl/Time-ParseDate-2015.103.0 b/metadata/md5-cache/dev-perl/Time-ParseDate-2015.103.0
index edcf9e8a965a..e4f76b85bc7f 100644
--- a/metadata/md5-cache/dev-perl/Time-ParseDate-2015.103.0
+++ b/metadata/md5-cache/dev-perl/Time-ParseDate-2015.103.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=Time-modules public-domain
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Time-ParseDate-2015.103.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6bee7341c9ec2a05d3ad6271cebcd044
+_md5_=7c508c3de27dac4297c39ae8fa471171
diff --git a/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0 b/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
index 1e947161ebc0..2bf546415eaa 100644
--- a/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
+++ b/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILTZU/Time-Stopwatch-1.00.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c9f36a6888c2bc30ede5beba5147836
+_md5_=17d808bcffd0197e235eab38adeef1e1
diff --git a/metadata/md5-cache/dev-perl/Time-TAI64-2.110.0-r2 b/metadata/md5-cache/dev-perl/Time-TAI64-2.110.0-r2
index 2bf4b66024be..fce758daa1e3 100644
--- a/metadata/md5-cache/dev-perl/Time-TAI64-2.110.0-r2
+++ b/metadata/md5-cache/dev-perl/Time-TAI64-2.110.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JO/JOVAL/Time-TAI64-2.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=886812d3d03d3a92ccc62cb3d8a4ca27
+_md5_=46497864c218ef2452a7384301856181
diff --git a/metadata/md5-cache/dev-perl/Time-TZOffset-0.40.0 b/metadata/md5-cache/dev-perl/Time-TZOffset-0.40.0
index a1601a3605e4..ceace7e78e74 100644
--- a/metadata/md5-cache/dev-perl/Time-TZOffset-0.40.0
+++ b/metadata/md5-cache/dev-perl/Time-TZOffset-0.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-Local dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Time-TZOffset-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=feadfbd0a2e22f23ee99181c43a22f67
+_md5_=8999d65ae6621e5946709364b00eb4b0
diff --git a/metadata/md5-cache/dev-perl/Tree-DAG_Node-1.310.0 b/metadata/md5-cache/dev-perl/Tree-DAG_Node-1.310.0
index 02792fb24ff5..3155665c166b 100644
--- a/metadata/md5-cache/dev-perl/Tree-DAG_Node-1.310.0
+++ b/metadata/md5-cache/dev-perl/Tree-DAG_Node-1.310.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Slurp-Tiny-0.3.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.31.tgz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f534bcc7b61f9b4f322591482659e390
+_md5_=d363fbad77ed1c4eca2a5310f9360257
diff --git a/metadata/md5-cache/dev-perl/Tree-Simple-1.330.0 b/metadata/md5-cache/dev-perl/Tree-Simple-1.330.0
index 43edc421ccd1..36b11f7ed347 100644
--- a/metadata/md5-cache/dev-perl/Tree-Simple-1.330.0
+++ b/metadata/md5-cache/dev-perl/Tree-Simple-1.330.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.180.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-1.33.tgz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1982712cd54339e9caedb6bac6049121
+_md5_=f2df7fd47ed37267929ef64bffdd9742
diff --git a/metadata/md5-cache/dev-perl/Try-Tiny-0.240.0 b/metadata/md5-cache/dev-perl/Try-Tiny-0.240.0
index 8d1975104c9f..12f99ad8b835 100644
--- a/metadata/md5-cache/dev-perl/Try-Tiny-0.240.0
+++ b/metadata/md5-cache/dev-perl/Try-Tiny-0.240.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!minimal? ( || ( >=virtual/perl-Scalar-List-Utils-1.400.0 dev-perl/Sub-Name ) ) virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f089218c2b62178869da375ee36d7139
+_md5_=1c48d73de6f384409de1c8d36b3c7b9d
diff --git a/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0 b/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0
index 64d7846d84c7..0c6bbc257aae 100644
--- a/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0
+++ b/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<=dev-perl/Try-Tiny-Except-0.10.0 !minimal? ( || ( >=virtual/perl-Scalar-List-Utils-1.400.0 dev-perl/Sub-Name ) ) virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7b864bc2fd2eb1e839bae8b4ba21da0d
+_md5_=47a98d61517867e9660f90c946d311a4
diff --git a/metadata/md5-cache/dev-perl/Type-Tie-0.9.0 b/metadata/md5-cache/dev-perl/Type-Tie-0.9.0
index e3de91f5dbee..89d78fe9062a 100644
--- a/metadata/md5-cache/dev-perl/Type-Tie-0.9.0
+++ b/metadata/md5-cache/dev-perl/Type-Tie-0.9.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Hash-FieldHash ) >=dev-perl/Exporter-Tiny-0.26.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tie-0.009.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7033dfb0656c70d2837b57a3fdd14f3f
+_md5_=8328a148ed77ac239852057e62db7c1c
diff --git a/metadata/md5-cache/dev-perl/Type-Tiny-1.2.1 b/metadata/md5-cache/dev-perl/Type-Tiny-1.2.1
index 3f03abac29f0..47761e714a89 100644
--- a/metadata/md5-cache/dev-perl/Type-Tiny-1.2.1
+++ b/metadata/md5-cache/dev-perl/Type-Tiny-1.2.1
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Kavorka-0.13.0 !<dev-perl/Types-ReadOnly-0.1.0 >=dev-perl/Exporter-Tiny-0.26.0 >=virtual/perl-Test-Simple-1.1.10 !minimal? ( >=dev-perl/Devel-LexAlias-0.50.0 dev-perl/Devel-StackTrace >=dev-perl/Ref-Util-XS-0.100.0 >=dev-perl/Regexp-Util-0.3.0 virtual/perl-Scalar-List-Utils dev-perl/Type-Tie >=dev-perl/Type-Tiny-XS-0.11.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.002001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3ad5f835de5e59a07a0656ee37d4b714
+_md5_=0f2d7f62d65bf965d58164d7a09434bb
diff --git a/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.12.0 b/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.12.0
index e947830f7ade..760df91eed9e 100644
--- a/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.12.0
+++ b/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.12.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Type-Tiny ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-0.012.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=462ee7896e6729537b8ecb306e287895
+_md5_=d58c8883d82c291a34c68dfe199f4d1a
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280 b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
index 377174ed6deb..40baa5bc487a 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ppc sparc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=710786a1daf5f90b05d493243955883b
+_md5_=17d12c41d68571039fbd6a623cf6d65e
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.506.140 b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.506.140
index 1e946424cd82..c263e928be80 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.506.140
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.506.140
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ppc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20150614.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13ec4c246e9a28dc8a1839c17b30dddf
+_md5_=c9b9bea24642a6be7b36b7421432f86c
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120 b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120
index f522e7464124..93dd6133bff4 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ppc sparc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20171012.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=44e4e1183acf57d75ff008cc1b4198d7
+_md5_=614a940534019b223ed32b0149faaacb
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1 b/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
index 4723c8b9acc4..64d7a56bb9c4 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ppc ppc64 x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/UNIVERSAL-moniker-0.08.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f594c509801cf759cadfbd942e7e262a
+_md5_=1ba3382f066a65255e5002eed925e5e3
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0 b/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
index 54883b79ebf9..ac2ce033c49b 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.18.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=330bc032a7d268c37705aa51b9841830
+_md5_=45c0d1c071a5a7c03a795f10f1aa1a25
diff --git a/metadata/md5-cache/dev-perl/URI-1.710.0 b/metadata/md5-cache/dev-perl/URI-1.710.0
index 3847adc97a86..ecfd8cbcafdc 100644
--- a/metadata/md5-cache/dev-perl/URI-1.710.0
+++ b/metadata/md5-cache/dev-perl/URI-1.710.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 >=virtual/perl-MIME-Base64-2 virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/URI-1.71.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=80ac50e1900c8b23017057cd37f76818
+_md5_=793857255b3d2d0af884e41ad7614c1a
diff --git a/metadata/md5-cache/dev-perl/URI-1.730.0 b/metadata/md5-cache/dev-perl/URI-1.730.0
index facaa634b83a..4a7c2066472f 100644
--- a/metadata/md5-cache/dev-perl/URI-1.730.0
+++ b/metadata/md5-cache/dev-perl/URI-1.730.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec >=virtual/perl-MIME-Base64-2 virtual/perl-Scalar-List-Utils virtual/perl-libnet virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/URI-1.73.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f311ab669f24563aedb38da2fc197834
+_md5_=eac93daaed4f036e248cb1dae35e6bc7
diff --git a/metadata/md5-cache/dev-perl/URI-Encode-1.1.1 b/metadata/md5-cache/dev-perl/URI-Encode-1.1.1
index 980cbb33f31e..932cc1b55021 100644
--- a/metadata/md5-cache/dev-perl/URI-Encode-1.1.1
+++ b/metadata/md5-cache/dev-perl/URI-Encode-1.1.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Encode-2.120.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MITHUN/URI-Encode-v1.1.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d340a32ccf7916ea3e8892ae6742aac4
+_md5_=f49a84578769b8bd195a9f6658faf67f
diff --git a/metadata/md5-cache/dev-perl/URI-Fetch-0.130.0 b/metadata/md5-cache/dev-perl/URI-Fetch-0.130.0
index 9196d26b1275..f68d8109d5be 100644
--- a/metadata/md5-cache/dev-perl/URI-Fetch-0.130.0
+++ b/metadata/md5-cache/dev-perl/URI-Fetch-0.130.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Class-ErrorHandler dev-perl/libwww-perl virtual/perl-Storable dev-perl/URI dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/URI-Fetch-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6176f6814c58f3de3d28d8cf592fd3b5
+_md5_=8a6b8c5c19ad4c6c4f9853289bc07a20
diff --git a/metadata/md5-cache/dev-perl/URI-Find-20140709.0.0 b/metadata/md5-cache/dev-perl/URI-Find-20140709.0.0
index e01bf85dfddc..15ee50454ca3 100644
--- a/metadata/md5-cache/dev-perl/URI-Find-20140709.0.0
+++ b/metadata/md5-cache/dev-perl/URI-Find-20140709.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/URI-1.600.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/URI-Find-20140709.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=10e1e27c02161c00e446234a2cee3eda
+_md5_=c6601377b7c71f8b0b30665d6df6f5fe
diff --git a/metadata/md5-cache/dev-perl/URI-Find-20160806.0.0 b/metadata/md5-cache/dev-perl/URI-Find-20160806.0.0
index 556f2a428cfd..92b252cd4d5b 100644
--- a/metadata/md5-cache/dev-perl/URI-Find-20160806.0.0
+++ b/metadata/md5-cache/dev-perl/URI-Find-20160806.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/URI-1.600.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/URI-Find-20160806.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d122222ffb1eced697612fbaea016761
+_md5_=956bde0de2cb9df85c13fed1595b9f1d
diff --git a/metadata/md5-cache/dev-perl/URI-redis-0.20.0 b/metadata/md5-cache/dev-perl/URI-redis-0.20.0
index a7826543187f..ee5d01b82dd5 100644
--- a/metadata/md5-cache/dev-perl/URI-redis-0.20.0
+++ b/metadata/md5-cache/dev-perl/URI-redis-0.20.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/URI dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ME/MENDEL/URI-redis-0.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=53c4340b1b4f0d2de18308d5eae2fc41
+_md5_=1c9a832356598f78889b35e664d10ef7
diff --git a/metadata/md5-cache/dev-perl/USB-LibUSB-0.50.0 b/metadata/md5-cache/dev-perl/USB-LibUSB-0.50.0
index 3ad190b4d02d..00abe2ea1144 100644
--- a/metadata/md5-cache/dev-perl/USB-LibUSB-0.50.0
+++ b/metadata/md5-cache/dev-perl/USB-LibUSB-0.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/libusb:1 virtual/perl-Carp virtual/perl-Exporter dev-perl/Moo virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBA/USB-LibUSB-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2ec5d2326412a96219d07ac77c6d5917
+_md5_=2e5c061dbaf0ca612b52749b9771aa93
diff --git a/metadata/md5-cache/dev-perl/USB-LibUSB-0.60.0 b/metadata/md5-cache/dev-perl/USB-LibUSB-0.60.0
index 33d91e5bcdf0..5be75c76ae8c 100644
--- a/metadata/md5-cache/dev-perl/USB-LibUSB-0.60.0
+++ b/metadata/md5-cache/dev-perl/USB-LibUSB-0.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/libusb:1 virtual/perl-Carp virtual/perl-Exporter dev-perl/Moo virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBA/USB-LibUSB-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bc5f5e42cc101687ed81effee233edfb
+_md5_=3911afda5cb9e34dbd18b91cf31f8d1a
diff --git a/metadata/md5-cache/dev-perl/USB-TMC-0.6.0 b/metadata/md5-cache/dev-perl/USB-TMC-0.6.0
index 0c6a43e7f68a..f07219c43674 100644
--- a/metadata/md5-cache/dev-perl/USB-TMC-0.6.0
+++ b/metadata/md5-cache/dev-perl/USB-TMC-0.6.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Moose dev-perl/MooseX-Params-Validate dev-perl/USB-LibUSB dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBA/USB-TMC-0.006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=043a0f5a196a4139cf37a9fb87fb26a3
+_md5_=0386d34c6be23065021a48e13539d83c
diff --git a/metadata/md5-cache/dev-perl/USB-TMC-0.7.0 b/metadata/md5-cache/dev-perl/USB-TMC-0.7.0
index 636a03264509..49a9b7f4cfa5 100644
--- a/metadata/md5-cache/dev-perl/USB-TMC-0.7.0
+++ b/metadata/md5-cache/dev-perl/USB-TMC-0.7.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Moose dev-perl/MooseX-Params-Validate dev-perl/USB-LibUSB dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBA/USB-TMC-0.007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bbcce53c7bf7bdb7c29d35795beeef25
+_md5_=9f927c0341dc5c49b1534720f76a2fc5
diff --git a/metadata/md5-cache/dev-perl/Unicode-Stringprep-1.105.0-r1 b/metadata/md5-cache/dev-perl/Unicode-Stringprep-1.105.0-r1
index f44bf542fe05..e10cda3c8eaf 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Stringprep-1.105.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-Stringprep-1.105.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Unicode-Normalize-1 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Unicode-Stringprep-1.105.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=85088bd21a324493639a1088588ad50a
+_md5_=2c904387f846dbbf234edb292c907e5c
diff --git a/metadata/md5-cache/dev-perl/Unicode-Stringprep-1.105.0-r2 b/metadata/md5-cache/dev-perl/Unicode-Stringprep-1.105.0-r2
index 3e1a1d106544..1afa64579f8a 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Stringprep-1.105.0-r2
+++ b/metadata/md5-cache/dev-perl/Unicode-Stringprep-1.105.0-r2
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Unicode-Normalize-1 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Unicode-Stringprep-1.105.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=468ac23498ba1c563f290d40f342e71c
+_md5_=fbc1f968d16803f30c1c759abaf39cf2
diff --git a/metadata/md5-cache/dev-perl/Unicode-UTF8-0.620.0 b/metadata/md5-cache/dev-perl/Unicode-UTF8-0.620.0
index 679b5416f49c..bbfcd1fecf52 100644
--- a/metadata/md5-cache/dev-perl/Unicode-UTF8-0.620.0
+++ b/metadata/md5-cache/dev-perl/Unicode-UTF8-0.620.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHANSEN/Unicode-UTF8-0.62.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ee218bc35b0f7ac4f24e41149a59c60b
+_md5_=c67f46daba428fac83885a484d068317
diff --git a/metadata/md5-cache/dev-perl/User-Identity-0.990.0 b/metadata/md5-cache/dev-perl/User-Identity-0.990.0
index 61518d12cbb5..c11ed5f17cdf 100644
--- a/metadata/md5-cache/dev-perl/User-Identity-0.990.0
+++ b/metadata/md5-cache/dev-perl/User-Identity-0.990.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Geography-Countries-1.400.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-0.99.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a57794e53b38355048746cf6b3b84064
+_md5_=a7e5ee22aac5d4a211a4a18f338dfbaf
diff --git a/metadata/md5-cache/dev-perl/Validate-Net-0.600.0-r1 b/metadata/md5-cache/dev-perl/Validate-Net-0.600.0-r1
index 6e2b2aefc51c..ea7929b6ef98 100644
--- a/metadata/md5-cache/dev-perl/Validate-Net-0.600.0-r1
+++ b/metadata/md5-cache/dev-perl/Validate-Net-0.600.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ~mips ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Default dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Validate-Net-0.6.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e351fe06b211ab4038c9eb7b6608ecde
+_md5_=5c2481d543c27e169648a2147199976f
diff --git a/metadata/md5-cache/dev-perl/Validate-Tiny-1.600.0-r1 b/metadata/md5-cache/dev-perl/Validate-Tiny-1.600.0-r1
index b33421737f09..13f7ceabc944 100644
--- a/metadata/md5-cache/dev-perl/Validate-Tiny-1.600.0-r1
+++ b/metadata/md5-cache/dev-perl/Validate-Tiny-1.600.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/List-MoreUtils-0.330.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MINIMAL/Validate-Tiny-1.6.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f7ed6328d0c7f7383c6eee0e2de4c3f1
+_md5_=42573610ef3cb35c0b66fa11398b2059
diff --git a/metadata/md5-cache/dev-perl/Variable-Magic-0.620.0 b/metadata/md5-cache/dev-perl/Variable-Magic-0.620.0
index a1ecfb28dd5a..b17acda1d0c1 100644
--- a/metadata/md5-cache/dev-perl/Variable-Magic-0.620.0
+++ b/metadata/md5-cache/dev-perl/Variable-Magic-0.620.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.62.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=98287bb418d6871b8598879450529025
+_md5_=a8219ed47d85aea8eaa54d5698e38c63
diff --git a/metadata/md5-cache/dev-perl/Version-Next-1.0.0 b/metadata/md5-cache/dev-perl/Version-Next-1.0.0
index 36f23559eec7..91d05f08cc4c 100644
--- a/metadata/md5-cache/dev-perl/Version-Next-1.0.0
+++ b/metadata/md5-cache/dev-perl/Version-Next-1.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp dev-perl/Sub-Exporter >=virtual/perl-version-0.810.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Version-Next-1.000.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=91fec4ed4947ababc42f4bc200fe778b
+_md5_=c4a8f482e471c99d41c2dba35397781c
diff --git a/metadata/md5-cache/dev-perl/Video-Info-0.993.0-r2 b/metadata/md5-cache/dev-perl/Video-Info-0.993.0-r2
index 6d5c223e9476..266bef58106f 100644
--- a/metadata/md5-cache/dev-perl/Video-Info-0.993.0-r2
+++ b/metadata/md5-cache/dev-perl/Video-Info-0.993.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~ia64 ~ppc sparc x86
 LICENSE=Aladdin
 RDEPEND=dev-perl/Class-MakeMethods dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALLENDAY/Video-Info-0.993.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3da5966bb77cea802d9d6d5f35a53b5d
+_md5_=9ba3c5a3b41c0c4d0793cdab2b6c024a
diff --git a/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-0.240.0 b/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-0.240.0
index 1f95b58aa2b6..98e534488aed 100644
--- a/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-0.240.0
+++ b/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-0.240.0
@@ -7,7 +7,8 @@ IUSE=test +xs examples
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.190.0 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8eff18c975d5e9202f6cbb760700cc0d
+_md5_=b30709bc9e734d5795fb934e3e331ecb
diff --git a/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-XS-0.240.0 b/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-XS-0.240.0
index 49a1b45654a7..83db420ca686 100644
--- a/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-XS-0.240.0
+++ b/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-XS-0.240.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-XS-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b8f21e7ef52412e09418cab63aa9fed4
+_md5_=b2cc6693cd7828e15d3ba3a7942d69c6
diff --git a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.870.0 b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.870.0
index 6e2897ad379a..dbad1d13d81a 100644
--- a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.870.0
+++ b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.870.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Getopt-Long dev-perl/HTML-Form >=dev-perl/HTML-Parser-3.340.0 dev-perl/HTML-Tree dev-perl/HTTP-Cookies dev-perl/HTTP-Message >=dev-perl/libwww-perl-5.827.0 virtual/perl-Tie-RefHash >=dev-perl/URI-1.360.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.87.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=526355e69c9959be7a5b9154ed9ce0d6
+_md5_=d5d7615fa80dae807679dfad3850b0de
diff --git a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.910.0 b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.910.0
index a8e8484052d7..036a4c87badf 100644
--- a/metadata/md5-cache/dev-perl/WWW-Mechanize-1.910.0
+++ b/metadata/md5-cache/dev-perl/WWW-Mechanize-1.910.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Getopt-Long dev-perl/HTML-Form >=dev-perl/HTML-Parser-3.340.0 >=dev-perl/HTML-Tree-5 dev-perl/HTTP-Cookies dev-perl/HTTP-Message >=dev-perl/libwww-perl-5.827.0 >=virtual/perl-Scalar-List-Utils-1.140.0 virtual/perl-Tie-RefHash >=dev-perl/URI-1.360.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.91.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0f8fb99a158a578539ddf65e98b0b839
+_md5_=9856e833c9bfa60cb55d60d4332e7ed5
diff --git a/metadata/md5-cache/dev-perl/WWW-Mechanize-FormFiller-0.120.0 b/metadata/md5-cache/dev-perl/WWW-Mechanize-FormFiller-0.120.0
index 28c8cbad7d48..12de542292ec 100644
--- a/metadata/md5-cache/dev-perl/WWW-Mechanize-FormFiller-0.120.0
+++ b/metadata/md5-cache/dev-perl/WWW-Mechanize-FormFiller-0.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Data-Random-0.50.0 dev-perl/HTML-Form dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORION/WWW-Mechanize-FormFiller-0.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f05a51feca2d6bc92d275cd5b9664e2d
+_md5_=0967adf4b7f99fd72dd388f7fb873cd4
diff --git a/metadata/md5-cache/dev-perl/WWW-Pastebin-PastebinCom-Create-1.3.0-r1 b/metadata/md5-cache/dev-perl/WWW-Pastebin-PastebinCom-Create-1.3.0-r1
index ae227c91ce98..a249c58b78b4 100644
--- a/metadata/md5-cache/dev-perl/WWW-Pastebin-PastebinCom-Create-1.3.0-r1
+++ b/metadata/md5-cache/dev-perl/WWW-Pastebin-PastebinCom-Create-1.3.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Moo-1.4.1 >=dev-perl/WWW-Mechanize-1.730.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZO/ZOFFIX/WWW-Pastebin-PastebinCom-Create-1.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=531deb8c29bb150c0200a37fc060ed75
+_md5_=c12b9d8c8626ec3202c1e4d9ab051bb6
diff --git a/metadata/md5-cache/dev-perl/WWW-Shorten-3.93.0 b/metadata/md5-cache/dev-perl/WWW-Shorten-3.93.0
index dd2d5ad643ac..4d92290b15bd 100644
--- a/metadata/md5-cache/dev-perl/WWW-Shorten-3.93.0
+++ b/metadata/md5-cache/dev-perl/WWW-Shorten-3.93.0
@@ -7,7 +7,8 @@ IUSE=test examples examples
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=examples? ( dev-perl/Config-Auto >=virtual/perl-Getopt-Long-2.400.0 >=dev-perl/Try-Tiny-0.240.0 ) virtual/perl-Carp >=dev-perl/libwww-perl-5.835.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPOEIRAB/WWW-Shorten-3.093.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=58fa508f3273c7e2b413d8c0042458a4
+_md5_=588c15bed69941f18ecb0806c2a81504
diff --git a/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0 b/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
index ddf9c4275c0d..851d508e9fc2 100644
--- a/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
+++ b/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/JSON dev-perl/libwww-perl dev-perl/LWP-Protocol-https dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEGRB/WebService-Linode-0.28.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b38a9c4643102aaad580816ea6172699
+_md5_=3271ccb797b503ca3945d42d047c87c0
diff --git a/metadata/md5-cache/dev-perl/Wx-0.993.200-r1 b/metadata/md5-cache/dev-perl/Wx-0.993.200-r1
index 92f3b02260eb..0f59aae587d2 100644
--- a/metadata/md5-cache/dev-perl/Wx-0.993.200-r1
+++ b/metadata/md5-cache/dev-perl/Wx-0.993.200-r1
@@ -7,7 +7,8 @@ IUSE=test test examples
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-wxWidgets-0.690.0-r1 x11-libs/wxGTK:3.0 >=virtual/perl-File-Spec-0.820.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=6daa6044ee94a96c3cde40a8d9bcd4b7
+_md5_=fd58e1af077caca878b81e4a09f765d5
diff --git a/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1 b/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1
index ec9a48b86549..28b953ddc8c5 100644
--- a/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/X11-XCB-0.170.0-r1
@@ -7,7 +7,8 @@ IUSE=test test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-Dump dev-perl/Mouse dev-perl/MouseX-NativeTraits dev-perl/Try-Tiny dev-perl/XML-Descent dev-perl/XML-Simple >=virtual/perl-XSLoader-0.20.0 >=x11-libs/libxcb-1.2 x11-libs/xcb-util x11-libs/xcb-util-wm dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=79319099f6d6b80ab1140d5b33da2425
+_md5_=524b623dbf0fed9b0171e14555c42027
diff --git a/metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.20.0-r1 b/metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.20.0-r1
index 85b50ef26b48..d34e6798297a 100644
--- a/metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.20.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-LibXML-1.69 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PAJAS/XML-CompactTree-XS-0.02.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=228bf91f09373559d39a353ba3ffeeff
+_md5_=879e6101d9f4c567e9cd39ea7c419516
diff --git a/metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.30.0 b/metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.30.0
index 4bb3e1bfb5c1..cd87038ff4bc 100644
--- a/metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.30.0
+++ b/metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.30.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-LibXML-1.690.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHOROBA/XML-CompactTree-XS-0.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c363f640b3f25e96d59a093b03e48abe
+_md5_=5c07b926e96bfbcdf4763b2c9eada52d
diff --git a/metadata/md5-cache/dev-perl/XML-Compile-1.600.0 b/metadata/md5-cache/dev-perl/XML-Compile-1.600.0
index c1fb620e40b2..d4127c6a7e46 100644
--- a/metadata/md5-cache/dev-perl/XML-Compile-1.600.0
+++ b/metadata/md5-cache/dev-perl/XML-Compile-1.600.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Digest-MD5-2.360.0 >=dev-perl/Log-Report-1.200.0 >=virtual/perl-MIME-Base64-3.100.0 >=virtual/perl-Math-BigInt-1.770.0 >=virtual/perl-Math-BigRat-0.100.0 dev-perl/Types-Serialiser virtual/perl-Scalar-List-Utils >=dev-perl/XML-LibXML-2.10.700 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/XML-Compile-1.60.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=18df0e77bda29dee8a9de60b58b6a50c
+_md5_=aa9f06bd9b9df8cd065aa1e9a6200b77
diff --git a/metadata/md5-cache/dev-perl/XML-Compile-Cache-1.50.0 b/metadata/md5-cache/dev-perl/XML-Compile-Cache-1.50.0
index 58efab714dc3..0f76877d9655 100644
--- a/metadata/md5-cache/dev-perl/XML-Compile-Cache-1.50.0
+++ b/metadata/md5-cache/dev-perl/XML-Compile-Cache-1.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Log-Report-0.190.0 >=dev-perl/XML-Compile-1.480.0 >=dev-perl/XML-LibXML-Simple-0.950.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/XML-Compile-Cache-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6bbd221c3a5d2385af919b7ad55de02e
+_md5_=2e28aa07f5a4f4253e1f4ad820183add
diff --git a/metadata/md5-cache/dev-perl/XML-Compile-Cache-1.60.0 b/metadata/md5-cache/dev-perl/XML-Compile-Cache-1.60.0
index 956cdf1d5d4d..bafb19b520d6 100644
--- a/metadata/md5-cache/dev-perl/XML-Compile-Cache-1.60.0
+++ b/metadata/md5-cache/dev-perl/XML-Compile-Cache-1.60.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Log-Report-1.260.0 >=dev-perl/XML-Compile-1.600.0 >=dev-perl/XML-LibXML-Simple-0.950.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/XML-Compile-Cache-1.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=61e44dcc6c66b8a99b45f049e35e88d7
+_md5_=8e1828ba1ae26f32437ec76ade5e11f4
diff --git a/metadata/md5-cache/dev-perl/XML-Compile-SOAP-3.240.0-r1 b/metadata/md5-cache/dev-perl/XML-Compile-SOAP-3.240.0-r1
index 924875e649ff..91806e781fe1 100644
--- a/metadata/md5-cache/dev-perl/XML-Compile-SOAP-3.240.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Compile-SOAP-3.240.0-r1
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-Slurp-Tiny >=dev-perl/libwww-perl-6.80.0 >=dev-perl/Log-Report-1.50.0 >=dev-perl/Net-HTTP-6.160.0 virtual/perl-Time-HiRes >=dev-perl/XML-Compile-1.580.0 >=dev-perl/XML-Compile-Cache-1.30.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/XML-Compile-SOAP-3.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=526b464c0704e68ddfa35b9cef40933e
+_md5_=360b1cef7a67d79bb6e2ea71a9523a6f
diff --git a/metadata/md5-cache/dev-perl/XML-Compile-Tester-0.900.0 b/metadata/md5-cache/dev-perl/XML-Compile-Tester-0.900.0
index 45934459af9c..437e9a4401ef 100644
--- a/metadata/md5-cache/dev-perl/XML-Compile-Tester-0.900.0
+++ b/metadata/md5-cache/dev-perl/XML-Compile-Tester-0.900.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Log-Report-0.170.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/XML-Compile-Tester-0.90.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9ae4630e69f1110f67e498d3febdb21d
+_md5_=d9906c74344f393d2948f418e4d1b112
diff --git a/metadata/md5-cache/dev-perl/XML-Compile-WSDL11-3.60.0-r1 b/metadata/md5-cache/dev-perl/XML-Compile-WSDL11-3.60.0-r1
index d044ee22f9d3..6c80026f3790 100644
--- a/metadata/md5-cache/dev-perl/XML-Compile-WSDL11-3.60.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Compile-WSDL11-3.60.0-r1
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Log-Report-1.50.0 >=dev-perl/XML-Compile-1.480.0 >=dev-perl/XML-Compile-Cache-1.30.0 >=dev-perl/XML-Compile-SOAP-3.160.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/XML-Compile-WSDL11-3.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=36a8db6be45283d9152286fdabdd4e6d
+_md5_=6feb32d842cc3119fce10a2dc11e09af
diff --git a/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1 b/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
index 926e8072c163..e66bfef42d45 100644
--- a/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl >=dev-perl/XML-Parser-2.300.0 dev-perl/XML-RegExp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.46.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f6c0e5e56a4622a4cf6c639d0b724ec5
+_md5_=d76fc367f4541feee9dbee53c75f7ebe
diff --git a/metadata/md5-cache/dev-perl/XML-DOM-XPath-0.140.0-r2 b/metadata/md5-cache/dev-perl/XML-DOM-XPath-0.140.0-r2
index 32863c955a8a..81834bebba03 100644
--- a/metadata/md5-cache/dev-perl/XML-DOM-XPath-0.140.0-r2
+++ b/metadata/md5-cache/dev-perl/XML-DOM-XPath-0.140.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-DOM dev-perl/XML-XPathEngine dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIROD/XML-DOM-XPath-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a0491a5808b99fa945373aa37fbe639f
+_md5_=81079dbee3b306a463bfb7b8b3edbbee
diff --git a/metadata/md5-cache/dev-perl/XML-DT-0.680.0 b/metadata/md5-cache/dev-perl/XML-DT-0.680.0
index bad453c316ca..acf5cd5eee04 100644
--- a/metadata/md5-cache/dev-perl/XML-DT-0.680.0
+++ b/metadata/md5-cache/dev-perl/XML-DT-0.680.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/libwww-perl-1.350.0 >=dev-perl/XML-LibXML-1.540.0 >=dev-perl/XML-DTDParser-2.0.0 virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/XML-DT-0.68.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0699b1dd0db50a206e7155319a2a8ac6
+_md5_=6623e401c86957015f0bf380dd371804
diff --git a/metadata/md5-cache/dev-perl/XML-Descent-1.40.0 b/metadata/md5-cache/dev-perl/XML-Descent-1.40.0
index 10c0a7a5a50e..96ab02d3440e 100644
--- a/metadata/md5-cache/dev-perl/XML-Descent-1.40.0
+++ b/metadata/md5-cache/dev-perl/XML-Descent-1.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-TokeParser dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/XML-Descent-1.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4587c5e080c29972a493015e42b69f6d
+_md5_=82bf69c3ca56162e8f3062add4b1c1df
diff --git a/metadata/md5-cache/dev-perl/XML-Encoding-2.90.0 b/metadata/md5-cache/dev-perl/XML-Encoding-2.90.0
index 21a12ac70271..cdc526212e00 100644
--- a/metadata/md5-cache/dev-perl/XML-Encoding-2.90.0
+++ b/metadata/md5-cache/dev-perl/XML-Encoding-2.90.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.180.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/XML-Encoding-2.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ac2a6cb02e138f047c9dbb5105d74e38
+_md5_=8bacbbdf7235924e523839744be17a34
diff --git a/metadata/md5-cache/dev-perl/XML-Entities-1.0.200 b/metadata/md5-cache/dev-perl/XML-Entities-1.0.200
index 4c4b07961d09..7e95a3ad6a46 100644
--- a/metadata/md5-cache/dev-perl/XML-Entities-1.0.200
+++ b/metadata/md5-cache/dev-perl/XML-Entities-1.0.200
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp !minimal? ( dev-perl/HTML-Parser ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIXTEASE/XML-Entities-1.0002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2e89512ddae9b6395500d03c1c532344
+_md5_=3fc4d75362792ee1e3ee98c0b57b58d4
diff --git a/metadata/md5-cache/dev-perl/XML-Feed-0.530.0-r1 b/metadata/md5-cache/dev-perl/XML-Feed-0.530.0-r1
index 2d59dc9ac70b..dc18142e8a8c 100644
--- a/metadata/md5-cache/dev-perl/XML-Feed-0.530.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Feed-0.530.0-r1
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/XML-RSS-LibXML ) dev-perl/Class-ErrorHandler dev-perl/Feed-Find dev-perl/URI-Fetch >=dev-perl/XML-RSS-1.470.0 >=dev-perl/XML-Atom-0.380.0 dev-perl/DateTime dev-perl/DateTime-Format-Mail dev-perl/DateTime-Format-W3CDTF dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/Module-Pluggable virtual/perl-Scalar-List-Utils !<dev-perl/XML-LibXML-1.660.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/XML-Feed-0.53.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=765c7a25d27b1a0c2a90fd71943569e7
+_md5_=d837bd26af17acc1b55282ef5abec398
diff --git a/metadata/md5-cache/dev-perl/XML-FeedPP-0.430.0 b/metadata/md5-cache/dev-perl/XML-FeedPP-0.430.0
index 581d809e63c7..d70326b861ec 100644
--- a/metadata/md5-cache/dev-perl/XML-FeedPP-0.430.0
+++ b/metadata/md5-cache/dev-perl/XML-FeedPP-0.430.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-TreePP-0.390.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAWASAKI/XML-FeedPP-0.43.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=382b5493db485674fd6f9c1e35d38bc0
+_md5_=6aba268de72336d0032c66ff080a5109
diff --git a/metadata/md5-cache/dev-perl/XML-Filter-DOMFilter-LibXML-0.40.0 b/metadata/md5-cache/dev-perl/XML-Filter-DOMFilter-LibXML-0.40.0
index 08d1364a22f7..cff69f464614 100644
--- a/metadata/md5-cache/dev-perl/XML-Filter-DOMFilter-LibXML-0.40.0
+++ b/metadata/md5-cache/dev-perl/XML-Filter-DOMFilter-LibXML-0.40.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ia64 sparc x86
 LICENSE=Artistic
 RDEPEND=>=dev-perl/XML-LibXML-1.53 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHOROBA/XML-Filter-DOMFilter-LibXML-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1aa274ab9edd708d5dff882aee23ccea
+_md5_=43f1f4859dd1ddd9bb928221757558cb
diff --git a/metadata/md5-cache/dev-perl/XML-LibXML-2.13.200 b/metadata/md5-cache/dev-perl/XML-LibXML-2.13.200
index 5687a887e858..5da78e82b36d 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXML-2.13.200
+++ b/metadata/md5-cache/dev-perl/XML-LibXML-2.13.200
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-SAX-0.120.0 >=dev-libs/libxml2-2.6.21 dev-perl/XML-SAX-Base >=dev-perl/XML-NamespaceSupport-1.70.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0132.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ad59b73a007542262735b8e52689c560
+_md5_=0f309112f6ffbb7a45977130cb4e3815
diff --git a/metadata/md5-cache/dev-perl/XML-LibXML-2.20.100 b/metadata/md5-cache/dev-perl/XML-LibXML-2.20.100
index 0f130da9c14a..f8c68b530d23 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXML-2.20.100
+++ b/metadata/md5-cache/dev-perl/XML-LibXML-2.20.100
@@ -7,7 +7,8 @@ IUSE=test minimal examples
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 virtual/perl-IO virtual/perl-Scalar-List-Utils >=dev-perl/XML-SAX-0.120.0 >=dev-libs/libxml2-2.6.21:2= dev-perl/XML-SAX-Base >=dev-perl/XML-NamespaceSupport-1.70.0 virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0201.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2497503a6ae0f36cee1650b4118d9549
+_md5_=2099aa3bff89f6587feb979c68442a25
diff --git a/metadata/md5-cache/dev-perl/XML-LibXML-Simple-0.970.0 b/metadata/md5-cache/dev-perl/XML-LibXML-Simple-0.970.0
index 403449bf35db..c3d86a9dd7e8 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXML-Simple-0.970.0
+++ b/metadata/md5-cache/dev-perl/XML-LibXML-Simple-0.970.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-Slurp-Tiny virtual/perl-Scalar-List-Utils >=dev-perl/XML-LibXML-1.640.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-0.97.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=53e1a2e65dca4274cc8ba4700df82b8d
+_md5_=8cb37396c83773276857091d1fb2d394
diff --git a/metadata/md5-cache/dev-perl/XML-LibXML-Simple-0.990.0 b/metadata/md5-cache/dev-perl/XML-LibXML-Simple-0.990.0
index d0202257d8c4..fbf49b956983 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXML-Simple-0.990.0
+++ b/metadata/md5-cache/dev-perl/XML-LibXML-Simple-0.990.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils >=dev-perl/XML-LibXML-1.640.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-0.99.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=31d975cf6b21774139e4530e1fdff61c
+_md5_=422b6b5169b629feda9107509258c9c7
diff --git a/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0 b/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
index 23673477870a..f7e07f815f27 100644
--- a/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
+++ b/metadata/md5-cache/dev-perl/XML-NamespaceSupport-1.120.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=72b2fcdf260dfc25f568e278a9a9429e
+_md5_=03f72c712293160f57ef3bf6af63c3d5
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0 b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
index b3a24ab896af..78bbb927c0f3 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.721.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c052f6d32adc05d1726a7a6929fddb17
+_md5_=f4a6e3fad851d1d8224dffcf10f906d9
diff --git a/metadata/md5-cache/dev-perl/XML-RSS-1.590.0 b/metadata/md5-cache/dev-perl/XML-RSS-1.590.0
index 70b3d9b718d8..f3753f2e9d21 100644
--- a/metadata/md5-cache/dev-perl/XML-RSS-1.590.0
+++ b/metadata/md5-cache/dev-perl/XML-RSS-1.590.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ~arm ppc ppc64 x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-perl/HTML-Parser dev-perl/DateTime-Format-Mail dev-perl/DateTime-Format-W3CDTF >=dev-perl/XML-Parser-2.230.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.59.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5005005c509c4b9436a403c63f9a7802
+_md5_=3082a8541fb0b627304895c8113b0a73
diff --git a/metadata/md5-cache/dev-perl/XML-RSS-1.600.0 b/metadata/md5-cache/dev-perl/XML-RSS-1.600.0
index b6a8fe5a6ad4..4f936f728342 100644
--- a/metadata/md5-cache/dev-perl/XML-RSS-1.600.0
+++ b/metadata/md5-cache/dev-perl/XML-RSS-1.600.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 ~arm arm64 ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/DateTime-Format-Mail dev-perl/DateTime-Format-W3CDTF dev-perl/HTML-Parser >=dev-perl/XML-Parser-2.230.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.60.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5b77cff9968da92a0845509a61ffcbc4
+_md5_=5ca688e37ca80eb4ed7edb7f7c8042f5
diff --git a/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1 b/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
index c7cebb0f5d59..58fba3dd84e6 100644
--- a/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser dev-perl/XML-RSS dev-perl/Clone virtual/perl-Time-HiRes dev-perl/URI virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JB/JBISBEE/XML-RSS-Feed-2.4.tar.gz https://dev.gentoo.org/~tove/distfiles/dev-perl/XML-RSS-Feed/XML-RSS-Feed-2.320.0-patch.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6497026203af62feb33c36d2155f6a8
+_md5_=636e9dac33c461f1e60d69c13d26c039
diff --git a/metadata/md5-cache/dev-perl/XML-RSS-LibXML-0.310.500 b/metadata/md5-cache/dev-perl/XML-RSS-LibXML-0.310.500
index b61eb3e85365..f4fcf6126788 100644
--- a/metadata/md5-cache/dev-perl/XML-RSS-LibXML-0.310.500
+++ b/metadata/md5-cache/dev-perl/XML-RSS-LibXML-0.310.500
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-perl/DateTime-Format-Mail dev-perl/DateTime-Format-W3CDTF virtual/perl-Encode dev-perl/UNIVERSAL-require >=dev-perl/XML-LibXML-1.660.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMAKI/XML-RSS-LibXML-0.3105.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cdd52822c0d1fb8b22600261aa385d6c
+_md5_=4a9df921ee1a6fdd7d85d96d9ff3ac42
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0 b/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
index 87c8d2fcdd7c..72c27745c171 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/XML-SAX-0.990.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=14b32573ecab14be3fbbb11f2b815269
+_md5_=cb9670d4ed0a1092d63aa973d1ead6c9
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0 b/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
index ebe7e7c7852c..54f1b0b25a3c 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=dev-perl/XML-SAX-0.15-r1 >=dev-perl/XML-NamespaceSupport-1.09 dev-perl/XML-Parser dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2ab806030f1b41183fe07132d2d315f9
+_md5_=a482775ac94e541d5e3d7d7f37408786
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-ExpatXS-1.330.0 b/metadata/md5-cache/dev-perl/XML-SAX-ExpatXS-1.330.0
index bfaf7de0a7b7..af41fa237449 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-ExpatXS-1.330.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-ExpatXS-1.330.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/expat >=dev-perl/XML-SAX-0.960.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PC/PCIMPRICH/XML-SAX-ExpatXS-1.33.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=086324c351b59f76ebd4f27434fbc7c2
+_md5_=2f1027adabd8227df900e3ee9b07b224
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Writer-0.570.0 b/metadata/md5-cache/dev-perl/XML-SAX-Writer-0.570.0
index 3cbf47e9a525..21f9584b3b26 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Writer-0.570.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Writer-0.570.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Encode-2.120.0 >=dev-perl/XML-Filter-BufferText-1.0.0 >=dev-perl/XML-SAX-Base-1.10.0 >=dev-perl/XML-NamespaceSupport-1.40.0 >=dev-libs/libxml2-2.4.1 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.57.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=21e3704cf7d443a4bd897838cbb2e3cf
+_md5_=3f35e47e29c258f444f1f1369d445ca0
diff --git a/metadata/md5-cache/dev-perl/XML-Simple-2.250.0 b/metadata/md5-cache/dev-perl/XML-Simple-2.250.0
index aba127fbc2c0..d8a10a079cc2 100644
--- a/metadata/md5-cache/dev-perl/XML-Simple-2.250.0
+++ b/metadata/md5-cache/dev-perl/XML-Simple-2.250.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Storable >=dev-perl/XML-NamespaceSupport-1.40.0 >=dev-perl/XML-SAX-0.150.0 dev-perl/XML-SAX-Expat dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.25.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=17d21243f492cd1b5d260e1ec9a699f1
+_md5_=3e66ea357274b673dccd1b50ca6d2a53
diff --git a/metadata/md5-cache/dev-perl/XML-Smart-1.790.0 b/metadata/md5-cache/dev-perl/XML-Smart-1.790.0
index ba2f38ea43d4..1118c350f232 100644
--- a/metadata/md5-cache/dev-perl/XML-Smart-1.790.0
+++ b/metadata/md5-cache/dev-perl/XML-Smart-1.790.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Object-MultiType-0.30.0 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMHARISH/XML-Smart-1.79.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f925e2fb8269d9413dd707fd6f6410a1
+_md5_=7fe0c04d5ec2f2f268da2526a4a2ae57
diff --git a/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0 b/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0
index 57a7ea6646f1..cefaf110f8fe 100644
--- a/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0
+++ b/metadata/md5-cache/dev-perl/XML-TokeParser-0.50.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PO/PODMASTER/XML-TokeParser-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fd301b978577d34e4645f52ec7c48447
+_md5_=d76bb5a91c128c4c14bc845bd5c7b45b
diff --git a/metadata/md5-cache/dev-perl/XML-Twig-3.520.0 b/metadata/md5-cache/dev-perl/XML-Twig-3.520.0
index 146201258eaa..610e9b21568c 100644
--- a/metadata/md5-cache/dev-perl/XML-Twig-3.520.0
+++ b/metadata/md5-cache/dev-perl/XML-Twig-3.520.0
@@ -7,7 +7,8 @@ IUSE=nls test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.31 >=virtual/perl-Scalar-List-Utils-1.230.0 >=virtual/perl-Encode-2.240.100_rc >=dev-libs/expat-1.95.5 dev-perl/Tie-IxHash dev-perl/XML-XPath >=dev-perl/libwww-perl-6.40.0 >=dev-perl/HTML-Parser-3.690.0 nls? ( >=dev-perl/Text-Iconv-1.2-r1 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.52.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=86f4a9f34d5e8c385aa1885b8003f0a0
+_md5_=9adeb1226f41beb19e59489dc3f09e70
diff --git a/metadata/md5-cache/dev-perl/XML-Writer-0.625.0 b/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
index 06d7e7926963..f86f56831dfc 100644
--- a/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
+++ b/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-linux ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.625.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a8902370f7d0314fa7cb380bfaa93374
+_md5_=52a09b2d5ebc9407e3be344572cf4edd
diff --git a/metadata/md5-cache/dev-perl/XML-XPath-1.370.0 b/metadata/md5-cache/dev-perl/XML-XPath-1.370.0
index f73abcd8604d..e7b44f883484 100644
--- a/metadata/md5-cache/dev-perl/XML-XPath-1.370.0
+++ b/metadata/md5-cache/dev-perl/XML-XPath-1.370.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 ~arm ~arm64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.230.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3a8194e1401d1653cb5e9f998664aa8c
+_md5_=c80911fdb49f0622d87655edfe415582
diff --git a/metadata/md5-cache/dev-perl/XML-XPath-1.420.0 b/metadata/md5-cache/dev-perl/XML-XPath-1.420.0
index efcfc28e0dfd..7c6425490d0e 100644
--- a/metadata/md5-cache/dev-perl/XML-XPath-1.420.0
+++ b/metadata/md5-cache/dev-perl/XML-XPath-1.420.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.230.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.42.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=072fe1f1f2b6e708f488c143c326aa27
+_md5_=d6932301840a60d33aeefadf41835e93
diff --git a/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1 b/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
index 796d407499de..1c7b4e6437e9 100644
--- a/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIROD/XML-XPathEngine-0.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=55971ddd4c9c50be5632cbf9d25c8144
+_md5_=1d3066f35ec3c48e2f32ef4dd3b4953e
diff --git a/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3 b/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3
index e6ceca74b86b..ff49b540aee2 100644
--- a/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3
+++ b/metadata/md5-cache/dev-perl/XS-Object-Magic-0.40.0-r3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/XS-Object-Magic-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=179b1313850837fb520d0debf438f3fe
+_md5_=4cbaf99567d71de855d7e1526486e8fb
diff --git a/metadata/md5-cache/dev-perl/YAML-1.150.0 b/metadata/md5-cache/dev-perl/YAML-1.150.0
index 723f6806ee83..a9adf3837d5a 100644
--- a/metadata/md5-cache/dev-perl/YAML-1.150.0
+++ b/metadata/md5-cache/dev-perl/YAML-1.150.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/YAML-1.15.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a25543e6e0ef73a304797526145ae14
+_md5_=4b52d0ad9cd3678bea34f2ab9184d0e8
diff --git a/metadata/md5-cache/dev-perl/YAML-1.240.0 b/metadata/md5-cache/dev-perl/YAML-1.240.0
index 69d7e52eef59..2c62d972f24e 100644
--- a/metadata/md5-cache/dev-perl/YAML-1.240.0
+++ b/metadata/md5-cache/dev-perl/YAML-1.240.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TINITA/YAML-1.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f39c5bd53c7179edd89cc320043b93bb
+_md5_=676b70261106357ef9c5c212bffec8c7
diff --git a/metadata/md5-cache/dev-perl/YAML-1.260.0-r1 b/metadata/md5-cache/dev-perl/YAML-1.260.0-r1
index 30d8a33c1ef0..231baccbd295 100644
--- a/metadata/md5-cache/dev-perl/YAML-1.260.0-r1
+++ b/metadata/md5-cache/dev-perl/YAML-1.260.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TINITA/YAML-1.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=072f5a0a3f1eb97c11ed29eaba0dd848
+_md5_=712c761c0a1ce73b8b92b511f8f0c72a
diff --git a/metadata/md5-cache/dev-perl/YAML-Syck-1.310.0 b/metadata/md5-cache/dev-perl/YAML-Syck-1.310.0
index 8b903b802652..8cf410a6df9d 100644
--- a/metadata/md5-cache/dev-perl/YAML-Syck-1.310.0
+++ b/metadata/md5-cache/dev-perl/YAML-Syck-1.310.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.31.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e04405f29b2965cc1484c3a87fb3734d
+_md5_=9d65461463a41f7a7c4e8afcaa5a3440
diff --git a/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0 b/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
index 5819490badcd..9ed52e07a3dc 100644
--- a/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
+++ b/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.69.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=920e7eea0e8b02bf1e0f0162aaf4ad8d
+_md5_=5bb9a984a88a7187c85eb07ee10b844c
diff --git a/metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0 b/metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0
index 7ae4aa517a0f..5712d30d9f9a 100644
--- a/metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0
+++ b/metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f0adc1438244be4c68d3b1d9bc0dc66f
+_md5_=8956a95cae54959366fe50b6d7ff44a8
diff --git a/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.90.0 b/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.90.0
index 1c60edd14ff8..25c6708b6f6c 100644
--- a/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.90.0
+++ b/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.90.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND==net-libs/zeromq-2* dev-perl/Task-Weaken >=dev-perl/ZMQ-Constants-1.0.0 >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMAKI/ZMQ-LibZMQ2-1.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e0e0a4e797f479268b2bf5dfc398f2f3
+_md5_=33b08c4485cc614823700297c413d8e1
diff --git a/metadata/md5-cache/dev-perl/ZMQ-LibZMQ3-1.190.0 b/metadata/md5-cache/dev-perl/ZMQ-LibZMQ3-1.190.0
index 6c8afdde2dab..c5d3fc41c93a 100644
--- a/metadata/md5-cache/dev-perl/ZMQ-LibZMQ3-1.190.0
+++ b/metadata/md5-cache/dev-perl/ZMQ-LibZMQ3-1.190.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND==net-libs/zeromq-3* dev-perl/ZMQ-Constants virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMAKI/ZMQ-LibZMQ3-1.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cf576df5e7ce78d06bbf5fbc4211331f
+_md5_=29e6c1ca370fcf6e2e20461f6d1cf6ea
diff --git a/metadata/md5-cache/dev-perl/aliased-0.340.0-r1 b/metadata/md5-cache/dev-perl/aliased-0.340.0-r1
index bd0d06c806a4..315ca4bce327 100644
--- a/metadata/md5-cache/dev-perl/aliased-0.340.0-r1
+++ b/metadata/md5-cache/dev-perl/aliased-0.340.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/aliased-0.34.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=db7972da4a0412f3e245409b2ce4ec61
+_md5_=c327c556af68064b6afb4b0231b34fea
diff --git a/metadata/md5-cache/dev-perl/asa-1.30.0-r1 b/metadata/md5-cache/dev-perl/asa-1.30.0-r1
index b8406df04400..54d49ab28613 100644
--- a/metadata/md5-cache/dev-perl/asa-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/asa-1.30.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/asa-1.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=360bca529e216aa0af96a4781292b99e
+_md5_=a97d809bbf5be5ff6a6fe690e40e294b
diff --git a/metadata/md5-cache/dev-perl/autobox-2.860.0 b/metadata/md5-cache/dev-perl/autobox-2.860.0
index 1e65de9e7c17..2f499bc1ac2a 100644
--- a/metadata/md5-cache/dev-perl/autobox-2.860.0
+++ b/metadata/md5-cache/dev-perl/autobox-2.860.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Scope-Guard-0.210.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-2.86.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f4d19ee9cad4a5cf689f4fc6c2eb859b
+_md5_=ebe91bb2a65f0a075922d42567a272af
diff --git a/metadata/md5-cache/dev-perl/autobox-3.0.1 b/metadata/md5-cache/dev-perl/autobox-3.0.1
index 037b5c70e5d9..d30b9e8a3764 100644
--- a/metadata/md5-cache/dev-perl/autobox-3.0.1
+++ b/metadata/md5-cache/dev-perl/autobox-3.0.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Scope-Guard-0.210.0 >=virtual/perl-version-0.770.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-v3.0.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=418840b1c8d37fec7711911f4fed9a32
+_md5_=124fca6c3add2fabb260ad3ad3741443
diff --git a/metadata/md5-cache/dev-perl/autovivification-0.180.0 b/metadata/md5-cache/dev-perl/autovivification-0.180.0
index 8482a838c6a9..9033ca518370 100644
--- a/metadata/md5-cache/dev-perl/autovivification-0.180.0
+++ b/metadata/md5-cache/dev-perl/autovivification-0.180.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cd1c62b195a8808f7f189835544fd67a
+_md5_=a8bfe39b550f978b8bf3fac169f7c753
diff --git a/metadata/md5-cache/dev-perl/bareword-filehandles-0.5.0 b/metadata/md5-cache/dev-perl/bareword-filehandles-0.5.0
index 07fe8aa77531..4233e14f0c27 100644
--- a/metadata/md5-cache/dev-perl/bareword-filehandles-0.5.0
+++ b/metadata/md5-cache/dev-perl/bareword-filehandles-0.5.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/B-Hooks-OP-Check dev-perl/Lexical-SealRequireHints virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/bareword-filehandles-0.005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=09af9bce201737cfe4b112d2beffe575
+_md5_=9427b75c82a236679aff96290eeb25c8
diff --git a/metadata/md5-cache/dev-perl/bareword-filehandles-0.6.0 b/metadata/md5-cache/dev-perl/bareword-filehandles-0.6.0
index fa342deab11b..aae47cd1c172 100644
--- a/metadata/md5-cache/dev-perl/bareword-filehandles-0.6.0
+++ b/metadata/md5-cache/dev-perl/bareword-filehandles-0.6.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/B-Hooks-OP-Check virtual/perl-if virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/bareword-filehandles-0.006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0337c81af7e808a247d66814484cd191
+_md5_=6df2fb9a82102a65903be60d42bcdd61
diff --git a/metadata/md5-cache/dev-perl/boolean-0.460.0 b/metadata/md5-cache/dev-perl/boolean-0.460.0
index 0b71bccf630b..d58a76b5ebcf 100644
--- a/metadata/md5-cache/dev-perl/boolean-0.460.0
+++ b/metadata/md5-cache/dev-perl/boolean-0.460.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/boolean-0.46.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d8e5283f083e7b8462c686f19e4799df
+_md5_=ead13d6b057dda134b4b37eeefbf6b8d
diff --git a/metadata/md5-cache/dev-perl/constant-defer-6.0.0 b/metadata/md5-cache/dev-perl/constant-defer-6.0.0
index 60bba71bcc91..1418a42196ed 100644
--- a/metadata/md5-cache/dev-perl/constant-defer-6.0.0
+++ b/metadata/md5-cache/dev-perl/constant-defer-6.0.0
@@ -7,7 +7,8 @@ IUSE=test examples
 KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/constant-defer-6.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1a0bc199479cb944d9ac092560803d02
+_md5_=5fbe3ec252cb16c6784e44696f95963d
diff --git a/metadata/md5-cache/dev-perl/forks-0.360.0-r1 b/metadata/md5-cache/dev-perl/forks-0.360.0-r1
index edec144449ee..adb1e983915b 100644
--- a/metadata/md5-cache/dev-perl/forks-0.360.0-r1
+++ b/metadata/md5-cache/dev-perl/forks-0.360.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Acme-Damn virtual/perl-Attribute-Handlers dev-perl/Devel-Symdump virtual/perl-File-Spec >=dev-perl/List-MoreUtils-0.150.0 >=virtual/perl-Scalar-List-Utils-1.110.0 virtual/perl-Storable >=dev-perl/Sys-SigAction-0.110.0 virtual/perl-Time-HiRes virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RY/RYBSKEJ/forks-0.36.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=91a1cff6845f2bde244ed9fca59ba4c2
+_md5_=83261d4d972698485b726ce861be0542
diff --git a/metadata/md5-cache/dev-perl/indirect-0.360.0 b/metadata/md5-cache/dev-perl/indirect-0.360.0
index 7e61c03bbeaa..09b6c0b6eff1 100644
--- a/metadata/md5-cache/dev-perl/indirect-0.360.0
+++ b/metadata/md5-cache/dev-perl/indirect-0.360.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/indirect-0.36.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6dc60c32fef950f7ca5ab9c5eee53d4a
+_md5_=db8ddf5c5659077107d48c41ab1db02d
diff --git a/metadata/md5-cache/dev-perl/indirect-0.370.0 b/metadata/md5-cache/dev-perl/indirect-0.370.0
index 7f769e062b79..0832126fdce7 100644
--- a/metadata/md5-cache/dev-perl/indirect-0.370.0
+++ b/metadata/md5-cache/dev-perl/indirect-0.370.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/indirect-0.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b11e624b8a18eb155e877d5d49db9aca
+_md5_=7466a56d34f2950bf1cb2eb6fd1874ae
diff --git a/metadata/md5-cache/dev-perl/libwww-perl-6.270.0 b/metadata/md5-cache/dev-perl/libwww-perl-6.270.0
index a51faf03d7ec..1e37126788c0 100644
--- a/metadata/md5-cache/dev-perl/libwww-perl-6.270.0
+++ b/metadata/md5-cache/dev-perl/libwww-perl-6.270.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh s
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=ssl? ( >=dev-perl/LWP-Protocol-https-6.20.0 )
 RDEPEND=virtual/perl-Digest-MD5 >=virtual/perl-Encode-2.120.0 dev-perl/Encode-Locale >=dev-perl/File-Listing-6.0.0 >=dev-perl/HTML-Parser-3.340.0 >=dev-perl/HTTP-Cookies-6.0.0 >=dev-perl/HTTP-Daemon-6.0.0 >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Negotiate-6.0.0 >=dev-perl/HTTP-Message-6.0.0 virtual/perl-IO >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-MIME-Base64-2.120.0 >=dev-perl/Net-HTTP-6.70.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny >=dev-perl/URI-1.100.0 >=dev-perl/WWW-RobotRules-6.0.0 >=virtual/perl-libnet-1.220.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dd60ad2f930251b93222d8dce9d25dbf
+_md5_=f46017a378d32db4be90da406eecd39b
diff --git a/metadata/md5-cache/dev-perl/local-lib-2.0.24 b/metadata/md5-cache/dev-perl/local-lib-2.0.24
index b61f71d83425..925876438456 100644
--- a/metadata/md5-cache/dev-perl/local-lib-2.0.24
+++ b/metadata/md5-cache/dev-perl/local-lib-2.0.24
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-1.820.0 >=virtual/perl-ExtUtils-Install-1.430.0 >=virtual/perl-ExtUtils-MakeMaker-7.0.0 >=dev-perl/Module-Build-0.360.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000024.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c62bdabd8fa25bec550a523533503a43
+_md5_=e2e7f602773a2ec4e5b8bb023eb8b8c8
diff --git a/metadata/md5-cache/dev-perl/multidimensional-0.13.0 b/metadata/md5-cache/dev-perl/multidimensional-0.13.0
index fa03c3e512a5..3689fc8ef4cb 100644
--- a/metadata/md5-cache/dev-perl/multidimensional-0.13.0
+++ b/metadata/md5-cache/dev-perl/multidimensional-0.13.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-OP-Check-0.190.0 >=dev-perl/Lexical-SealRequireHints-0.5.0 virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/multidimensional-0.013.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=530f667898661e177bb000322eec7af4
+_md5_=049ff5d15ebcecf13e6ca0fbf0e90adb
diff --git a/metadata/md5-cache/dev-perl/namespace-autoclean-0.280.0 b/metadata/md5-cache/dev-perl/namespace-autoclean-0.280.0
index 871e679f94c7..b2e3d7748813 100644
--- a/metadata/md5-cache/dev-perl/namespace-autoclean-0.280.0
+++ b/metadata/md5-cache/dev-perl/namespace-autoclean-0.280.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify >=dev-perl/namespace-clean-0.200.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.28.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ec43a9c8b96dd533d4eed0c823c6356c
+_md5_=052d9aef080000085112d526e6695ac8
diff --git a/metadata/md5-cache/dev-perl/namespace-clean-0.270.0 b/metadata/md5-cache/dev-perl/namespace-clean-0.270.0
index 685379b28855..c952518d6114 100644
--- a/metadata/md5-cache/dev-perl/namespace-clean-0.270.0
+++ b/metadata/md5-cache/dev-perl/namespace-clean-0.270.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 >=dev-perl/Package-Stash-0.230.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=924c9763be9d00ea858e0da29ad37523
+_md5_=2bd141c47d29f2d99f7b6497615e3135
diff --git a/metadata/md5-cache/dev-perl/self-0.350.0 b/metadata/md5-cache/dev-perl/self-0.350.0
index 179489b86d7c..a1d152f949eb 100644
--- a/metadata/md5-cache/dev-perl/self-0.350.0
+++ b/metadata/md5-cache/dev-perl/self-0.350.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-perl/B-Hooks-Parser-0.80.0 >=dev-perl/B-OPCheck-0.270.0 >=dev-perl/Devel-Declare-0.3.4 >=dev-perl/PadWalker-1.930.0 dev-perl/Sub-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUGOD/self-0.35.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e457f7f4c3cdfecb096a429ac7a0369e
+_md5_=b0e77307d7d2212efbca46fa1a89a9e7
diff --git a/metadata/md5-cache/dev-perl/strictures-2.0.3 b/metadata/md5-cache/dev-perl/strictures-2.0.3
index f256be859506..8f6dd3bb6864 100644
--- a/metadata/md5-cache/dev-perl/strictures-2.0.3
+++ b/metadata/md5-cache/dev-perl/strictures-2.0.3
@@ -7,7 +7,8 @@ IUSE=test minimal
 KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/bareword-filehandles dev-perl/indirect dev-perl/multidimensional ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e5fd70a34b01ef80cccf2ed34656abd8
+_md5_=5472de4a169284b51c22d6bcdaf490d7
diff --git a/metadata/md5-cache/dev-perl/syntax-0.4.0-r1 b/metadata/md5-cache/dev-perl/syntax-0.4.0-r1
index 0cea4a29ef55..54c43e098e26 100644
--- a/metadata/md5-cache/dev-perl/syntax-0.4.0-r1
+++ b/metadata/md5-cache/dev-perl/syntax-0.4.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Data-OptList-0.104.0 dev-perl/namespace-clean dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHAYLON/syntax-0.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a671bc8c53ea98abcb9e6ee29681d840
+_md5_=06d387ded41d8c1e7b201769711eef66
diff --git a/metadata/md5-cache/dev-php/PEAR-Console_Getargs-1.4.0 b/metadata/md5-cache/dev-php/PEAR-Console_Getargs-1.4.0
index ad9a52dcabff..dd3c11172a2a 100644
--- a/metadata/md5-cache/dev-php/PEAR-Console_Getargs-1.4.0
+++ b/metadata/md5-cache/dev-php/PEAR-Console_Getargs-1.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=PHP-3
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Console_Getargs-1.4.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=0c38c6296df43fe68bcfe814726ab4b9
+_md5_=e5f1a4fda4c3225cdbd369c25e53a19d
diff --git a/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.1 b/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.1
index 8e8dc044ec9c..984caeb41c92 100644
--- a/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.1
+++ b/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Console_Table-1.3.1.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=7993f8a62c969ae6e2d2265e1917f1fd
+_md5_=e2e64c4172bc598c26490901b563d55b
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r2 b/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r2
index 553df60dfb9d..657f475267fe 100644
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r2
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/php:*[crypt,hash] >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Crypt_CHAP-1.5.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=55d70859ec83a22b90de5ed0464f6106
+_md5_=51d4a7fff9d13432436da9a21efc3239
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r3 b/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r3
index 71fd7bfbb1d9..70f1c7c2083d 100644
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r3
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=|| ( ( dev-php/pecl-mcrypt >=dev-lang/php-7.2:*[hash(+)] ) <dev-lang/php-7.2:*[crypt,hash] ) >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Crypt_CHAP-1.5.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=ebf83420c8bbf9082d306ae7e29900fe
+_md5_=0679a93ae643edb29ca21b11ec19e8b4
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2 b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2
index 3ca7216d6081..4b05ba04abd8 100644
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=amd64 arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_CommandLine dev-php/PEAR-Exception
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Crypt_GPG-1.6.2.tgz
-_md5_=55bc9bc43d0c41b76766d830c8339769
+_md5_=a6458bf515b49b93db65d3ff289fe391
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.3 b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.3
index a9fd763966d4..e6e002a90ed7 100644
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.3
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.3
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_CommandLine dev-php/PEAR-Exception
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Crypt_GPG-1.6.3.tgz
-_md5_=a9cbf81b56be266e630b36a0d4479269
+_md5_=c454d6143ca3181f451bd499970dcd38
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC-1.0.1-r2 b/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC-1.0.1-r2
index a2919499a1bb..88fe93940cb5 100644
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC-1.0.1-r2
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC-1.0.1-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=PHP-3
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Crypt_HMAC-1.0.1.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=2514f19059ee9698bd2f1c8ae480c7d4
+_md5_=7d753e2a71de0dfc920a3b025f85da66
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC2-1.0.0-r1 b/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC2-1.0.0-r1
index 3003e5ceda1b..f787c824a196 100644
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC2-1.0.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC2-1.0.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Crypt_HMAC2-1.0.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=55f186496b38544a65d963b26304b138
+_md5_=fa80b4a637b4715886aed11ed6e62104
diff --git a/metadata/md5-cache/dev-php/PEAR-DB-1.9.2-r1 b/metadata/md5-cache/dev-php/PEAR-DB-1.9.2-r1
index a96fa5ec5903..e123987f575c 100644
--- a/metadata/md5-cache/dev-php/PEAR-DB-1.9.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-DB-1.9.2-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=PHP-3
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/DB-1.9.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=6feb15b4bb8953d4ac4376ef6a4b2b6e
+_md5_=f4b55f60c85133a336280af7b43bc151
diff --git a/metadata/md5-cache/dev-php/PEAR-DB-1.9.3 b/metadata/md5-cache/dev-php/PEAR-DB-1.9.3
index 3b8af9f9a86e..0866368f474a 100644
--- a/metadata/md5-cache/dev-php/PEAR-DB-1.9.3
+++ b/metadata/md5-cache/dev-php/PEAR-DB-1.9.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=PHP-3
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/DB-1.9.3.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=5483f67f31d500377847802e7841a1e8
+_md5_=8808152090be8867e2081ad23e71ea12
diff --git a/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0 b/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
index 4ebc4803bef9..e8659105cfed 100644
--- a/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
+++ b/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-lang/php:* !<=dev-php/PEAR-PEAR-1.10.3-r1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/PEAR_Exception-1.0.0.tgz
-_md5_=55e32e3500903c6c43b932a2d2a32567
+_md5_=3ebc2ae7c1b4f3b67878390c52d3ba8e
diff --git a/metadata/md5-cache/dev-php/PEAR-File-1.4.1-r1 b/metadata/md5-cache/dev-php/PEAR-File-1.4.1-r1
index 5e4e0e3bbd7a..f089544033b7 100644
--- a/metadata/md5-cache/dev-php/PEAR-File-1.4.1-r1
+++ b/metadata/md5-cache/dev-php/PEAR-File-1.4.1-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=PHP-3
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/File-1.4.1.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=bda43c48d3a429e2bc5ea11ca9fee3b3
+_md5_=8683519d3849d263e6c388749167cf4b
diff --git a/metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3 b/metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3
index 91af872cd690..ba247e24b2c7 100644
--- a/metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3
+++ b/metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/File_Find-1.3.3.tgz
-_md5_=e7bb1fb66ca90ec40a476a574ccef9c5
+_md5_=d140af7bbbac5ef715f294236bdd9b4a
diff --git a/metadata/md5-cache/dev-php/PEAR-File_Fortune-1.0.0-r1 b/metadata/md5-cache/dev-php/PEAR-File_Fortune-1.0.0-r1
index 5b8630df8c50..c2d02deb2bdb 100644
--- a/metadata/md5-cache/dev-php/PEAR-File_Fortune-1.0.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-File_Fortune-1.0.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/php-5.1.4:* >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/File_Fortune-1.0.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=0e3439b6b707d2efacd44f60800c1be7
+_md5_=f449977e7b1a49997f7af0c79d804465
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_CSS-1.5.4-r2 b/metadata/md5-cache/dev-php/PEAR-HTML_CSS-1.5.4-r2
index ac33e3a3247a..6dff3a15e222 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_CSS-1.5.4-r2
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_CSS-1.5.4-r2
@@ -7,7 +7,8 @@ IUSE=minimal test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-HTML_Common-1.2.4 !minimal? ( >=dev-php/PEAR-Services_W3C_CSSValidator-0.1.0 ) >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_CSS-1.5.4.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=32d44e23a7b41290d6a8071d1cbaf602
+_md5_=d555b2165a5987763ea2ec3b37f64f3a
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Common2-2.1.1 b/metadata/md5-cache/dev-php/PEAR-HTML_Common2-2.1.1
index 515ad6a016ba..e98330fedaf3 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_Common2-2.1.1
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Common2-2.1.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_Common2-2.1.1.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=95c92938618775086ffc7dd00416057e
+_md5_=c4ab7705d00fa40aa16292f372bdef14
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Common2-2.1.2 b/metadata/md5-cache/dev-php/PEAR-HTML_Common2-2.1.2
index 6e03702fd3b0..9deda77fe481 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_Common2-2.1.2
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Common2-2.1.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_Common2-2.1.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=1e11ebb790a634db246624a0703b731b
+_md5_=e7ce669bb1e1b41e13d9259eb184d0a3
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Table-1.8.4-r1 b/metadata/md5-cache/dev-php/PEAR-HTML_Table-1.8.4-r1
index 476608da6288..537cc9564853 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_Table-1.8.4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Table-1.8.4-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-HTML_Common-1.2.3 >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_Table-1.8.4.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=f977ebd26bdf96c3575d78fb2eca9c09
+_md5_=c07a3023366bced95aa2f8fabebcedd6
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Template_Sigma-1.3.0-r1 b/metadata/md5-cache/dev-php/PEAR-HTML_Template_Sigma-1.3.0-r1
index ae8781ed72cd..2415ede40333 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_Template_Sigma-1.3.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Template_Sigma-1.3.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:*[ctype] >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_Template_Sigma-1.3.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=f6bdab957fdafde20e80bfde26e002c0
+_md5_=000662f0de2812a5f862657cab77e322
diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3 b/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
index 80654080a0a2..d24762aa82e1 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
+++ b/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTTP-1.4.1.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-pear-r2	479e8a084e98f4d730da647bba3e589e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbf3e59d28d6e62fed5fe5eb6dffc81b
+_md5_=2bab2816532feb4f281e24e5ce53048f
diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.3.0-r1 b/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.3.0-r1
index 28fb75d1baf1..a7975705836d 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.3.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.3.0-r1
@@ -7,7 +7,8 @@ IUSE=+curl +fileinfo +ssl test +zlib
 KEYWORDS=~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?] >=dev-php/PEAR-Net_URL2-2.2.0 >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTTP_Request2-2.3.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=576ce46be26869517cd84d347fbb2e9d
+_md5_=e9b2a8f53948886ef7d6682d622e9c12
diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP_Session2-0.7.3-r2 b/metadata/md5-cache/dev-php/PEAR-HTTP_Session2-0.7.3-r2
index f05c842ced76..d4ed1d18e158 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTTP_Session2-0.7.3-r2
+++ b/metadata/md5-cache/dev-php/PEAR-HTTP_Session2-0.7.3-r2
@@ -7,7 +7,8 @@ IUSE=minimal test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=!minimal? ( >=dev-php/PEAR-MDB2-2.4.1 >=dev-php/PEAR-DB-1.7.11 ) >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTTP_Session2-0.7.3.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=f059ba0357347270fb83ce4e62353895
+_md5_=e2b63bc62bc4f129cb0dd783a67ce086
diff --git a/metadata/md5-cache/dev-php/PEAR-Image_Color2-0.1.5-r1 b/metadata/md5-cache/dev-php/PEAR-Image_Color2-0.1.5-r1
index f39fc7e2a5fe..5ef52dc570d9 100644
--- a/metadata/md5-cache/dev-php/PEAR-Image_Color2-0.1.5-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Image_Color2-0.1.5-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Image_Color2-0.1.5.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=12d5942e6ab4c8ba743c55d8aa69e56b
+_md5_=be10046e92e51cb93768f5b3b1562125
diff --git a/metadata/md5-cache/dev-php/PEAR-Image_GraphViz-1.3.0_p20151104 b/metadata/md5-cache/dev-php/PEAR-Image_GraphViz-1.3.0_p20151104
index fda5326eed05..4504694a57d0 100644
--- a/metadata/md5-cache/dev-php/PEAR-Image_GraphViz-1.3.0_p20151104
+++ b/metadata/md5-cache/dev-php/PEAR-Image_GraphViz-1.3.0_p20151104
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 hppa ~ia64 ~sparc x86
 LICENSE=PHP-3
 RDEPEND=media-gfx/graphviz >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pear/Image_GraphViz/archive/3f8a01ae0597ca9d1d08a6e442cb0b153358fc0d.tar.gz -> Image_GraphViz-1.3.0_p20151104.tar.gz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=7c968d81da48495346002681f783c19b
+_md5_=1f1d831556c448c772870d716eaa75d6
diff --git a/metadata/md5-cache/dev-php/PEAR-Image_Text-0.7.0-r1 b/metadata/md5-cache/dev-php/PEAR-Image_Text-0.7.0-r1
index c38ec543c76f..c7891e642326 100644
--- a/metadata/md5-cache/dev-php/PEAR-Image_Text-0.7.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Image_Text-0.7.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=PHP-3
 RDEPEND=dev-lang/php:*[gd,truetype] >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Image_Text-0.7.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=671446b20eafd7036653b5c56bd5c654
+_md5_=62a2f6d8db9cf823b0b78fa3f56996a3
diff --git a/metadata/md5-cache/dev-php/PEAR-Log-1.13.1 b/metadata/md5-cache/dev-php/PEAR-Log-1.13.1
index af2e453349c7..0714c0084fcd 100644
--- a/metadata/md5-cache/dev-php/PEAR-Log-1.13.1
+++ b/metadata/md5-cache/dev-php/PEAR-Log-1.13.1
@@ -7,6 +7,7 @@ IUSE=examples test
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-DB dev-php/PEAR-Mail dev-php/PEAR-MDB2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Log-1.13.1.tgz
-_md5_=8dd9f52d284338ce3cc4a3d519049009
+_md5_=409cd244420f62926937905ec427bd54
diff --git a/metadata/md5-cache/dev-php/PEAR-Mail-1.4.1-r1 b/metadata/md5-cache/dev-php/PEAR-Mail-1.4.1-r1
index 9a76c2353d29..4aa90a41ee94 100644
--- a/metadata/md5-cache/dev-php/PEAR-Mail-1.4.1-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Mail-1.4.1-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-Net_SMTP-1.4.1 >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Mail-1.4.1.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=0f106f92f5b9653beec735d5f95cd560
+_md5_=d0a8166562b25312068fe27ba5246715
diff --git a/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.2-r1 b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.2-r1
index 005f09b099fb..069190e58b95 100644
--- a/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.2-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Mail_Mime-1.10.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=4518907c33131c62df06b3b4c43e77d5
+_md5_=8a2124028d61244fa9e09c8ea70d975d
diff --git a/metadata/md5-cache/dev-php/PEAR-Mail_mimeDecode-1.5.6-r2 b/metadata/md5-cache/dev-php/PEAR-Mail_mimeDecode-1.5.6-r2
index ba92ec98043d..2229e12c84ab 100644
--- a/metadata/md5-cache/dev-php/PEAR-Mail_mimeDecode-1.5.6-r2
+++ b/metadata/md5-cache/dev-php/PEAR-Mail_mimeDecode-1.5.6-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-Mail_Mime-1.5.2 >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Mail_mimeDecode-1.5.6.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=038ee5d8a478dbddd41c813646b0f0a1
+_md5_=9fa06ae43df1ce9feafde5a5acc26306
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_IPv6-1.3.0_beta4 b/metadata/md5-cache/dev-php/PEAR-Net_IPv6-1.3.0_beta4
index 2d87ee107ae3..eda90eb4bc21 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_IPv6-1.3.0_beta4
+++ b/metadata/md5-cache/dev-php/PEAR-Net_IPv6-1.3.0_beta4
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_IPv6-1.3.0b4.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=cbb4b973eaf9bc9aa27d27a581fce483
+_md5_=43621f500e5a3bfc943d720c8517253a
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_LDAP2-2.2.0-r1 b/metadata/md5-cache/dev-php/PEAR-Net_LDAP2-2.2.0-r1
index 5d2d993c7cb6..45f2954bdfe7 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_LDAP2-2.2.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_LDAP2-2.2.0-r1
@@ -7,6 +7,7 @@ IUSE=examples test
 KEYWORDS=~alpha amd64 arm hppa ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/php:*[ldap] dev-php/PEAR-PEAR
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Net_LDAP2-2.2.0.tgz
-_md5_=48481bf208166ab22be4e3cfb4dd6b73
+_md5_=bf1ca98bcd8be2ee980b9ac240b86075
diff --git a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1 b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
index 7c20d06e0efa..2dd60b6e685c 100644
--- a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-Math_BigInteger
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Numbers_Words-0.18.1.tgz
-_md5_=684a0a6ca825664abe029a0459087e3b
+_md5_=491c7e8999c1a2b9f986e40fe6218788
diff --git a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.2 b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.2
index c1ab8395e013..44806582d007 100644
--- a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.2
+++ b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=PHP-3.01
 RDEPEND=dev-php/PEAR-Math_BigInteger >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Numbers_Words-0.18.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=0c8857d60eb01c85f61e45ac64f23723
+_md5_=92ed1a64dff56f41fb88d2f54b4203ef
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1 b/metadata/md5-cache/dev-php/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1
index 6da1254abfb8..5832b9219d8f 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Text_CAPTCHA_Numeral-1.3.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=d8a49c1ffd401301758cfe243d826a36
+_md5_=3378cfad8593bf67f24869ec4fdb3f8c
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1 b/metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1
index 51b4f621f81c..2ccf12f6c0f9 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Text_Password-1.2.1.tgz
-_md5_=94cb82aeef137474214b10e12d80c2c2
+_md5_=3b852d4209d6855554632d621f3a8d26
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2_p20170904 b/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2_p20170904
index de9906b7a531..5866ee6bd8f5 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2_p20170904
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2_p20170904
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pear/Text_Wiki/archive/32fd5f483f34645f4efd96d385d8950ea26d4a2a.tar.gz -> Text_Wiki-1.2.2_p20170904.tar.gz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=9de8e22db06e0693d15084f627f35e05
+_md5_=e062b002188ea5b2e24328c63b1c95bc
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.3 b/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.3
index 65c8b51455c8..40b342a5160a 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.3
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Text_Wiki-1.2.3.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=d66409778ac7f04dc8ecc0a6ac35f61a
+_md5_=23d202c071999fdafbc8d26a5be5b943
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604 b/metadata/md5-cache/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604
index 70af6c57f715..611e3b5b8269 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-php/PEAR-Text_Wiki-1.2.2_p20170904 >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pear/Text_Wiki_Mediawiki/archive/11a902741d3f8cc6010fb97b825d66345143e4dc.tar.gz -> Text_Wiki_Mediawiki-0.2.0_p20140604.tar.gz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=325124f60446464f4fc3508066524d62
+_md5_=f10506355cd8debe2ede4ad47afafb1c
diff --git a/metadata/md5-cache/dev-php/PEAR-Validate-0.8.5-r1 b/metadata/md5-cache/dev-php/PEAR-Validate-0.8.5-r1
index b6fd6c80f482..93d472bef7e5 100644
--- a/metadata/md5-cache/dev-php/PEAR-Validate-0.8.5-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Validate-0.8.5-r1
@@ -7,7 +7,8 @@ IUSE=minimal test
 KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=!minimal? ( dev-php/PEAR-Date ) >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Validate-0.8.5.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=3a9e2e4197f73f29ff1036a4ac390b14
+_md5_=e6c0540049fccbb6f2a6f938f5b1193a
diff --git a/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314 b/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314
index 354ffd5000f8..5c82d307fda2 100644
--- a/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314
+++ b/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pear/VersionControl_SVN/archive/6c9580df92f0cc77a6eb6fcc216c56913bf308e7.tar.gz -> PEAR-VersionControl_SVN-0.5.2_p20180314.tar.gz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=7c89bc31a6cda70419c0e67a101727ae
+_md5_=1e9149a1dc2fcd5de39e7f62cc14b077
diff --git a/metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1 b/metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1
index dc9210670fb7..c6a21346dadd 100644
--- a/metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1
@@ -7,7 +7,8 @@ IUSE=examples test
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/php:*[xml] >=dev-php/PEAR-XML_Parser-1.2.7 >=dev-php/PEAR-XML_Util-1.1.1-r1 >=dev-php/pear-1.8.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/XML_Serializer-0.21.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=32245f5432715c4d23bb5446ca3d5e87
+_md5_=7f07dc703015e2b050f3c729cd961ac6
diff --git a/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.2.1 b/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.2.1
index 86e6c14f9b28..262a2c362c8c 100644
--- a/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.2.1
+++ b/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.2.1
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-lang/php:*[cli,tokenizer,xmlwriter]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/PHP_CodeSniffer-3.2.1.tgz
-_md5_=8e09952a566ad544fbbc043ce0e4f562
+_md5_=c02d44f9e1f548e794a077dcef918146
diff --git a/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.4.2 b/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.4.2
index a63f803cd471..91181707f0bd 100644
--- a/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.4.2
+++ b/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.4.2
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-lang/php:*[cli,tokenizer,xmlwriter]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/PHP_CodeSniffer-3.4.2.tgz
-_md5_=a59b262b16fb8bb3fa2c14cc44967dd5
+_md5_=5144c6c8f3e454306cadd14a7e330fbc
diff --git a/metadata/md5-cache/dev-php/awl-0.59 b/metadata/md5-cache/dev-php/awl-0.59
index b9f714efbc81..927b3058019a 100644
--- a/metadata/md5-cache/dev-php/awl-0.59
+++ b/metadata/md5-cache/dev-php/awl-0.59
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 GPL-2+ GPL-3+ LGPL-2+ LGPL-3+
 RDEPEND=dev-lang/php:*[pdo,postgres,xml]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.davical.org/downloads/awl_0.59.orig.tar.xz -> awl-0.59.tar.xz
-_md5_=0dc87b964a807fcb478d50e166e65ddd
+_md5_=906183704ab8561d9ba3d200d79868e1
diff --git a/metadata/md5-cache/dev-php/awl-0.60 b/metadata/md5-cache/dev-php/awl-0.60
index 188f105a2570..4e844c8449bb 100644
--- a/metadata/md5-cache/dev-php/awl-0.60
+++ b/metadata/md5-cache/dev-php/awl-0.60
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 GPL-2+ GPL-3+ LGPL-2+ LGPL-3+
 RDEPEND=dev-lang/php:*[pdo,postgres,xml]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.davical.org/downloads/awl_0.60.orig.tar.xz -> awl-0.60.tar.xz
-_md5_=444764222581878a7d21b3b41b4c8fc9
+_md5_=29da62092d18885ab3f3285dddf158f3
diff --git a/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1 b/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1
index 49292828b12d..dc8447639e41 100644
--- a/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1
+++ b/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/php-fedora/autoloader/archive/0.2.1.tar.gz -> fedora-autoloader-0.2.1.tar.gz
-_md5_=76562276c5339266b5912df76e640de5
+_md5_=5fbe643d5e9c7af62eb295b912c170b7
diff --git a/metadata/md5-cache/dev-php/geos-php-1.0.0 b/metadata/md5-cache/dev-php/geos-php-1.0.0
index 61aa9e74dfe2..790db43b06be 100644
--- a/metadata/md5-cache/dev-php/geos-php-1.0.0
+++ b/metadata/md5-cache/dev-php/geos-php-1.0.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/geos[-php(-)] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://git.osgeo.org/gitea/geos/php-geos/archive/1.0.0.tar.gz -> geos-php-1.0.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5bf6d03fc2c3a91b52a1a6540b78be23
+_md5_=833c189f6b6cffd749372941d4667ae8
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.4.4 b/metadata/md5-cache/dev-php/pecl-imagick-3.4.4
index fd0e8aa938ac..ef2fffc287b4 100644
--- a/metadata/md5-cache/dev-php/pecl-imagick-3.4.4
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.4.4
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=PHP-3.01
 RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/imagick-3.4.4.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8b68bb433c375aed958fc58c59897b8e
+_md5_=6bd20c9af9c214c500b3e4ec4d57a183
diff --git a/metadata/md5-cache/dev-php/pecl-memcached-3.1.3 b/metadata/md5-cache/dev-php/pecl-memcached-3.1.3
index 661807cebe43..5b4debb2d5df 100644
--- a/metadata/md5-cache/dev-php/pecl-memcached-3.1.3
+++ b/metadata/md5-cache/dev-php/pecl-memcached-3.1.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 x86
 LICENSE=PHP-3
 RDEPEND=php_targets_php7-0? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0(-)?,php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?] ) dev-lang/php:7.0[session?,json?] ) php_targets_php7-1? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0(-)?,php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?] ) dev-lang/php:7.1[session?,json?] ) php_targets_php7-2? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0(-)?,php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?] ) dev-lang/php:7.2[session?,json?] ) php_targets_php7-3? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0(-)?,php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?] ) dev-lang/php:7.3[session?,json?] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
+RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/memcached-3.1.3.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fc3a14538c64bfa65557f1f41ed9b0df
+_md5_=d26ac04617493fec48892a5a1966ca23
diff --git a/metadata/md5-cache/dev-php/pecl-memcached-3.1.3-r1 b/metadata/md5-cache/dev-php/pecl-memcached-3.1.3-r1
index 1980f0f950e8..21b60128ae31 100644
--- a/metadata/md5-cache/dev-php/pecl-memcached-3.1.3-r1
+++ b/metadata/md5-cache/dev-php/pecl-memcached-3.1.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=PHP-3
 RDEPEND=php_targets_php7-1? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib dev-lang/php:7.1[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php7-1(-)] ) ) php_targets_php7-2? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib dev-lang/php:7.2[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php7-2(-)] ) ) php_targets_php7-3? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib dev-lang/php:7.3[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] ) ) php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6(-)] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
+RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/memcached-3.1.3.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=687425d2289acf8a4e38b9bd5da17dea
+_md5_=123a63bf8be8050303751ff79b370eb5
diff --git a/metadata/md5-cache/dev-php/pecl-stomp-2.0.2 b/metadata/md5-cache/dev-php/pecl-stomp-2.0.2
index 4553473f3c56..f44ae87d0835 100644
--- a/metadata/md5-cache/dev-php/pecl-stomp-2.0.2
+++ b/metadata/md5-cache/dev-php/pecl-stomp-2.0.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3.01
 RDEPEND=php_targets_php7-1? ( dev-lang/php:7.1[ssl?] ) php_targets_php7-2? ( dev-lang/php:7.2[ssl?] ) php_targets_php7-3? ( dev-lang/php:7.3[ssl?] ) php_targets_php5-6? ( dev-php/pecl-stomp:0 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
+RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/stomp-2.0.2.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=66678be560addd0c4247d0d2aad69082
+_md5_=34f53ff48644e003b7315a09b238ac07
diff --git a/metadata/md5-cache/dev-php/php-redmine-api-1.5.16 b/metadata/md5-cache/dev-php/php-redmine-api-1.5.16
index 473c8d708d34..dfdc91c0742e 100644
--- a/metadata/md5-cache/dev-php/php-redmine-api-1.5.16
+++ b/metadata/md5-cache/dev-php/php-redmine-api-1.5.16
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*[curl,json,simplexml]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kbsali/php-redmine-api/archive/v1.5.16.tar.gz -> php-redmine-api-1.5.16.tar.gz
-_md5_=165dd85402d17f22c2f87bb7af5a2f30
+_md5_=0f1a832e106c5147cd18f50bac1341b9
diff --git a/metadata/md5-cache/dev-php/php-redmine-api-1.5.9 b/metadata/md5-cache/dev-php/php-redmine-api-1.5.9
index c9c1b51b962f..97f4e0bc06b6 100644
--- a/metadata/md5-cache/dev-php/php-redmine-api-1.5.9
+++ b/metadata/md5-cache/dev-php/php-redmine-api-1.5.9
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*[curl,json,simplexml]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kbsali/php-redmine-api/archive/v1.5.9.tar.gz -> php-redmine-api-1.5.9.tar.gz
-_md5_=da9f434d7348e7fbd0258e0674dd96f1
+_md5_=2e334c68d3c31fd99e1d3e5da37d6729
diff --git a/metadata/md5-cache/dev-php/phptal-1.3.1 b/metadata/md5-cache/dev-php/phptal-1.3.1
index c4226a3e34e4..9c1eb50a6a62 100644
--- a/metadata/md5-cache/dev-php/phptal-1.3.1
+++ b/metadata/md5-cache/dev-php/phptal-1.3.1
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/php:*
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/phptal/PHPTAL/archive/v1.3.1.tar.gz -> phptal-1.3.1.tar.gz
-_md5_=5e0cca57d8c4a7fe971bded1286bf5a6
+_md5_=17518f163d532b252dd914afcf0f453d
diff --git a/metadata/md5-cache/dev-php/recaptcha-1.2.1 b/metadata/md5-cache/dev-php/recaptcha-1.2.1
index 3d0fb572e6d2..bf2deb1d5d35 100644
--- a/metadata/md5-cache/dev-php/recaptcha-1.2.1
+++ b/metadata/md5-cache/dev-php/recaptcha-1.2.1
@@ -7,6 +7,7 @@ IUSE=examples test
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-lang/php
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/recaptcha/archive/1.2.1.tar.gz -> recaptcha-1.2.1.tar.gz
-_md5_=2ea1369a429d707d411999ee50784648
+_md5_=961aa509c43d87b13785257398036ebe
diff --git a/metadata/md5-cache/dev-php/symfony-config-2.8.20 b/metadata/md5-cache/dev-php/symfony-config-2.8.20
index 1187405fb21a..4ac98f70e5bf 100644
--- a/metadata/md5-cache/dev-php/symfony-config-2.8.20
+++ b/metadata/md5-cache/dev-php/symfony-config-2.8.20
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:* dev-php/fedora-autoloader dev-php/symfony-filesystem
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symfony/config/archive/v2.8.20.tar.gz -> symfony-config-2.8.20.tar.gz
-_md5_=a5c72c58a248fa691363785395e41e9e
+_md5_=c5ab9ddf1d4a81311b63d3056cb151e5
diff --git a/metadata/md5-cache/dev-php/symfony-event-dispatcher-2.1.0-r1 b/metadata/md5-cache/dev-php/symfony-event-dispatcher-2.1.0-r1
index e868404b6ae3..a84a989939b8 100644
--- a/metadata/md5-cache/dev-php/symfony-event-dispatcher-2.1.0-r1
+++ b/metadata/md5-cache/dev-php/symfony-event-dispatcher-2.1.0-r1
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/symfony-dependency-injection-2.1.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symfony/event-dispatcher/archive/v2.1.0.tar.gz -> symfony-event-dispatcher-2.1.0.tar.gz
-_md5_=282c9b3bbad5a6d489412aed848880be
+_md5_=f0596ee55dc699dff01e199586895b4b
diff --git a/metadata/md5-cache/dev-php/symfony-event-dispatcher-2.8.50 b/metadata/md5-cache/dev-php/symfony-event-dispatcher-2.8.50
index 36cc3fe11627..42d64e3ea057 100644
--- a/metadata/md5-cache/dev-php/symfony-event-dispatcher-2.8.50
+++ b/metadata/md5-cache/dev-php/symfony-event-dispatcher-2.8.50
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/symfony-dependency-injection-2.1.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symfony/event-dispatcher/archive/v2.8.50.tar.gz -> symfony-event-dispatcher-2.8.50.tar.gz
-_md5_=4da23c45f0462359b94e55536642158c
+_md5_=f0596ee55dc699dff01e199586895b4b
diff --git a/metadata/md5-cache/dev-php/symfony-finder-3.2.8 b/metadata/md5-cache/dev-php/symfony-finder-3.2.8
index a03c8c46ac72..3b610791e300 100644
--- a/metadata/md5-cache/dev-php/symfony-finder-3.2.8
+++ b/metadata/md5-cache/dev-php/symfony-finder-3.2.8
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symfony/finder/archive/v3.2.8.tar.gz -> symfony-finder-3.2.8.tar.gz
-_md5_=95890d50a44c1b5b64c18da6073ba22e
+_md5_=1a029126a37e377b7ca316ee04a7bcc8
diff --git a/metadata/md5-cache/dev-php/symfony-finder-3.4.28 b/metadata/md5-cache/dev-php/symfony-finder-3.4.28
index ed032aa08bc0..5a8e482c4cc5 100644
--- a/metadata/md5-cache/dev-php/symfony-finder-3.4.28
+++ b/metadata/md5-cache/dev-php/symfony-finder-3.4.28
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symfony/finder/archive/v3.4.28.tar.gz -> symfony-finder-3.4.28.tar.gz
-_md5_=9c08b7b2e770ce47bfcea058f8dc2bdb
+_md5_=9ff1549054dd5ea66c74b929904b0caa
diff --git a/metadata/md5-cache/dev-python/APScheduler-3.3.1 b/metadata/md5-cache/dev-python/APScheduler-3.3.1
index d63ce3f4ec07..bd27725c4b36 100644
--- a/metadata/md5-cache/dev-python/APScheduler-3.3.1
+++ b/metadata/md5-cache/dev-python/APScheduler-3.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tzlocal-1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/APScheduler/APScheduler-3.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7427342605a787308fdc1108e7913afc
+_md5_=d52edf23c920be69ecd69eddd9f4b883
diff --git a/metadata/md5-cache/dev-python/APScheduler-3.5.3 b/metadata/md5-cache/dev-python/APScheduler-3.5.3
index 3c2acabaad26..94139c263ce0 100644
--- a/metadata/md5-cache/dev-python/APScheduler-3.5.3
+++ b/metadata/md5-cache/dev-python/APScheduler-3.5.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tzlocal-1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/APScheduler/APScheduler-3.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ad14990955a54fc8c4baa9252216513
+_md5_=cd7064877148517e0295baac38404d45
diff --git a/metadata/md5-cache/dev-python/ImageHash-3.4 b/metadata/md5-cache/dev-python/ImageHash-3.4
index 4c0ffe4e1707..f82eda40969c 100644
--- a/metadata/md5-cache/dev-python/ImageHash-3.4
+++ b/metadata/md5-cache/dev-python/ImageHash-3.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pywavelets[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/I/ImageHash/ImageHash-3.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d0d59d1eff774e2abea8d035bbd1e061
+_md5_=3be849cff7252ea922e0ec5020e0c672
diff --git a/metadata/md5-cache/dev-python/ImageHash-3.7 b/metadata/md5-cache/dev-python/ImageHash-3.7
index 15f02e6ebfce..f401aa3e6ab8 100644
--- a/metadata/md5-cache/dev-python/ImageHash-3.7
+++ b/metadata/md5-cache/dev-python/ImageHash-3.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pywavelets[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/I/ImageHash/ImageHash-3.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d0d59d1eff774e2abea8d035bbd1e061
+_md5_=3be849cff7252ea922e0ec5020e0c672
diff --git a/metadata/md5-cache/dev-python/ImageHash-4.0 b/metadata/md5-cache/dev-python/ImageHash-4.0
index 338c61a4343a..e08afaa2d11a 100644
--- a/metadata/md5-cache/dev-python/ImageHash-4.0
+++ b/metadata/md5-cache/dev-python/ImageHash-4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pywavelets[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/I/ImageHash/ImageHash-4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2a34b7a15b48b95506740dfd714e515
+_md5_=9824e6f1bfdf8a9d29035349a7ade4d7
diff --git a/metadata/md5-cache/dev-python/Kivy-1.10.0 b/metadata/md5-cache/dev-python/Kivy-1.10.0
index 78a0df4642de..3043e3e3f3ed 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.10.0
+++ b/metadata/md5-cache/dev-python/Kivy-1.10.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] cairo? ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) camera? ( media-libs/opencv:0/2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) garden? ( dev-python/kivy-garden[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) gstreamer? ( dev-python/gst-python:1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) sdl? ( media-libs/libsdl2 media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-mixer ) !sdl? ( dev-python/pygame[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) spell? ( dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kivy/Kivy/archive/1.10.0.tar.gz -> Kivy-1.10.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f2004b6f729175898a61f4cb5c9ba04
+_md5_=2a850f784594c3c1257190759bf86e9a
diff --git a/metadata/md5-cache/dev-python/Kivy-1.10.1 b/metadata/md5-cache/dev-python/Kivy-1.10.1
index f7bc20d403b2..0b5c085a22fe 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.10.1
+++ b/metadata/md5-cache/dev-python/Kivy-1.10.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=media-libs/mesa[gles2] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] cairo? ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) camera? ( media-libs/opencv:0/2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) garden? ( dev-python/kivy-garden[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gstreamer? ( dev-python/gst-python:1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sdl? ( media-libs/libsdl2 media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-mixer ) !sdl? ( dev-python/pygame[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) spell? ( dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kivy/Kivy/archive/1.10.1.tar.gz -> Kivy-1.10.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5f4ceb9bc788c2cce086357f83bef9b6
+_md5_=bc9cd0868fb3d51c9a9754d21e7255a2
diff --git a/metadata/md5-cache/dev-python/Kivy-1.9.1 b/metadata/md5-cache/dev-python/Kivy-1.9.1
index 9452e28fed6c..1af454977730 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.9.1
+++ b/metadata/md5-cache/dev-python/Kivy-1.9.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] cairo? ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) camera? ( media-libs/opencv:0/2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) garden? ( dev-python/kivy-garden[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) gstreamer? ( dev-python/gst-python:1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) sdl? ( media-libs/libsdl2 media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-mixer ) !sdl? ( dev-python/pygame[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) spell? ( dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pypi.io/packages/source/K/Kivy/kivy-1.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8293ce370aea5ed33198f82916ff7378
+_md5_=1bbf0c3711ff8b1d31675f90f91adf79
diff --git a/metadata/md5-cache/dev-python/Kivy-1.9.1-r1 b/metadata/md5-cache/dev-python/Kivy-1.9.1-r1
index d3b926d00e86..e1e726200bfc 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.9.1-r1
+++ b/metadata/md5-cache/dev-python/Kivy-1.9.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] cairo? ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) camera? ( media-libs/opencv:0/2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) garden? ( dev-python/kivy-garden[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) gstreamer? ( dev-python/gst-python:1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) sdl? ( media-libs/libsdl2 media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-mixer ) !sdl? ( dev-python/pygame[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) spell? ( dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pypi.io/packages/source/K/Kivy/kivy-1.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69080f60ba50cf93b5c8f41898ced4ac
+_md5_=fd515c9115c422acc5b87012c7327fa5
diff --git a/metadata/md5-cache/dev-python/Numdifftools-0.9.13 b/metadata/md5-cache/dev-python/Numdifftools-0.9.13
index 49494707be89..99f4fe4bf19c 100644
--- a/metadata/md5-cache/dev-python/Numdifftools-0.9.13
+++ b/metadata/md5-cache/dev-python/Numdifftools-0.9.13
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/algopy-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-libs/scipy-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/N/Numdifftools/numdifftools-0.9.13.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2998c56f05cfe87898aa1d0cef007395
+_md5_=4caaaba77dbaddd56db3a654a3f01a71
diff --git a/metadata/md5-cache/dev-python/Numdifftools-0.9.14 b/metadata/md5-cache/dev-python/Numdifftools-0.9.14
index 00b3911cf086..cfa03cba79d1 100644
--- a/metadata/md5-cache/dev-python/Numdifftools-0.9.14
+++ b/metadata/md5-cache/dev-python/Numdifftools-0.9.14
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/algopy-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-libs/scipy-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/N/Numdifftools/numdifftools-0.9.14.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f42e07db10d1c975e5d06dd68ea7e23
+_md5_=1176ba66bd4e0deddf0d9bd1daa708f7
diff --git a/metadata/md5-cache/dev-python/Numdifftools-0.9.17 b/metadata/md5-cache/dev-python/Numdifftools-0.9.17
index 570a4cfeeb18..8b12ea06cbe1 100644
--- a/metadata/md5-cache/dev-python/Numdifftools-0.9.17
+++ b/metadata/md5-cache/dev-python/Numdifftools-0.9.17
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/algopy-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/N/Numdifftools/numdifftools-0.9.17.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a74f19e03f988eadb476772192cfdaa
+_md5_=e3a847e3181e809d2cc6631f9fafc872
diff --git a/metadata/md5-cache/dev-python/PyECLib-1.5.0 b/metadata/md5-cache/dev-python/PyECLib-1.5.0
index 5cf98278e53d..9e027640ae8f 100644
--- a/metadata/md5-cache/dev-python/PyECLib-1.5.0
+++ b/metadata/md5-cache/dev-python/PyECLib-1.5.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/liberasurecode dev-libs/jerasure python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyeclib/pyeclib-1.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e41c6f64291ae178d169eb8bbc18b441
+_md5_=ff363b42ff89d230dec0eab4bcc6ee51
diff --git a/metadata/md5-cache/dev-python/PyECLib-1.6.0 b/metadata/md5-cache/dev-python/PyECLib-1.6.0
index a7718f4f1466..01c46fb13c91 100644
--- a/metadata/md5-cache/dev-python/PyECLib-1.6.0
+++ b/metadata/md5-cache/dev-python/PyECLib-1.6.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/liberasurecode dev-libs/jerasure python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyeclib/pyeclib-1.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=828f0a28f9cfaed653fcfd068fc25bda
+_md5_=fce4028792eda4c6afe3bc684eccb5da
diff --git a/metadata/md5-cache/dev-python/PySDL2-0.9.6 b/metadata/md5-cache/dev-python/PySDL2-0.9.6
index 8c9570e422f6..2ce07cae1f06 100644
--- a/metadata/md5-cache/dev-python/PySDL2-0.9.6
+++ b/metadata/md5-cache/dev-python/PySDL2-0.9.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( public-domain CC0-1.0 ZLIB )
 RDEPEND=media-libs/libsdl2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySDL2/PySDL2-0.9.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23c4547e31a1dbda26d0171d51728a2d
+_md5_=59b66501300f7a5ef2e04ac87a5d0c88
diff --git a/metadata/md5-cache/dev-python/PyUtilib-5.6.5 b/metadata/md5-cache/dev-python/PyUtilib-5.6.5
index 7fd222380cd4..c70a24b4a796 100644
--- a/metadata/md5-cache/dev-python/PyUtilib-5.6.5
+++ b/metadata/md5-cache/dev-python/PyUtilib-5.6.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyUtilib/PyUtilib-5.6.5.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7811a08f756504ffeef1ca4e01af393f
+_md5_=15dcb1a359475bfe422f0075243bce70
diff --git a/metadata/md5-cache/dev-python/URLObject-2.4.2-r1 b/metadata/md5-cache/dev-python/URLObject-2.4.2-r1
index 99711131d455..f4c510b70dae 100644
--- a/metadata/md5-cache/dev-python/URLObject-2.4.2-r1
+++ b/metadata/md5-cache/dev-python/URLObject-2.4.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zacharyvoase/urlobject/archive/v2.4.2.tar.gz -> urlobject-2.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=351b29b3aa8749c4963be4e4983a28fe
+_md5_=1f64be730336ee5516b5e2aa85635e50
diff --git a/metadata/md5-cache/dev-python/URLObject-2.4.3 b/metadata/md5-cache/dev-python/URLObject-2.4.3
index 6247dd35f7a0..72c3e60d0021 100644
--- a/metadata/md5-cache/dev-python/URLObject-2.4.3
+++ b/metadata/md5-cache/dev-python/URLObject-2.4.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zacharyvoase/urlobject/archive/v2.4.3.tar.gz -> urlobject-2.4.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e16cb9ca712b5a9eb5602ef29d6d8c0
+_md5_=1570013fe6eaefe07c5e3c519bae4837
diff --git a/metadata/md5-cache/dev-python/aadict-0.2.3 b/metadata/md5-cache/dev-python/aadict-0.2.3
index 3264c7b00734..b6ed705b7789 100644
--- a/metadata/md5-cache/dev-python/aadict-0.2.3
+++ b/metadata/md5-cache/dev-python/aadict-0.2.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=dev-python/six-1.6.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aadict/aadict-0.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f70c995b9a281a0e3bb86303e2b8547
+_md5_=531240fd63eda1bf8949019bbc779efc
diff --git a/metadata/md5-cache/dev-python/abstract_rendering-0.5.1 b/metadata/md5-cache/dev-python/abstract_rendering-0.5.1
index bcd11b4be275..0f19f9e8f1cf 100644
--- a/metadata/md5-cache/dev-python/abstract_rendering-0.5.1
+++ b/metadata/md5-cache/dev-python/abstract_rendering-0.5.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=uni_indiana
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/abstract_rendering/abstract_rendering-0.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07b7848611f1516dc139aee905c276a7
+_md5_=4eb10a9f897cbbdb6144d157c7f94cd8
diff --git a/metadata/md5-cache/dev-python/aioeventlet-0.5.1-r1 b/metadata/md5-cache/dev-python/aioeventlet-0.5.1-r1
index 48c506c61b54..e507a6ac339a 100644
--- a/metadata/md5-cache/dev-python/aioeventlet-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/aioeventlet-0.5.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/eventlet[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/trollius-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aioeventlet/aioeventlet-0.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9b093df445fc569eb665a16bf1811a7
+_md5_=00897c2eedb56a357e315c6a04e54705
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.6.0 b/metadata/md5-cache/dev-python/aiohttp-cors-0.6.0
index 105229d13ae5..05ccfac596d3 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.6.0
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.6.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.6.0.tar.gz -> aiohttp-cors-0.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb575cdff3b480da1147fb34991e04f9
+_md5_=41ede889f73fd88ca339b61903ceebe3
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0 b/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0
index bbad178ae54e..e6bca11fb705 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.7.0.tar.gz -> aiohttp-cors-0.7.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d026712f9a7cbc98c6349a73f1e66f19
+_md5_=17940295168f498c73a782cb91f9fb6c
diff --git a/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0 b/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
index 2878ec8fbfac..35317eefb93d 100644
--- a/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
+++ b/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aiohttp-2.3.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.10[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-jinja2/aiohttp-jinja2-0.15.0.tar.gz -> aiohttp-jinja2-0.15.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ebf8d6cf7f854f78741efad012be3e89
+_md5_=01800e7d57d0926b011cb4372b32e3c6
diff --git a/metadata/md5-cache/dev-python/alembic-0.9.3 b/metadata/md5-cache/dev-python/alembic-0.9.3
index 6172096404e3..6ce62b96bbfb 100644
--- a/metadata/md5-cache/dev-python/alembic-0.9.3
+++ b/metadata/md5-cache/dev-python/alembic-0.9.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/sqlalchemy-0.8.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-editor-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-0.9.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1de008f88572a12c873a2a764c9ad6e0
+_md5_=acd71e038b34f791ef8eff11e3c1eae4
diff --git a/metadata/md5-cache/dev-python/alembic-0.9.5 b/metadata/md5-cache/dev-python/alembic-0.9.5
index 59ba77e2362e..6e19d0eea59b 100644
--- a/metadata/md5-cache/dev-python/alembic-0.9.5
+++ b/metadata/md5-cache/dev-python/alembic-0.9.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/sqlalchemy-0.8.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-editor-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-0.9.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14437cfffa908c81a77b5824ae2ae9ce
+_md5_=27d0eff7673109f7a3126d94ac5ecd34
diff --git a/metadata/md5-cache/dev-python/alembic-0.9.7 b/metadata/md5-cache/dev-python/alembic-0.9.7
index cf7848a5800b..cd15a8131a19 100644
--- a/metadata/md5-cache/dev-python/alembic-0.9.7
+++ b/metadata/md5-cache/dev-python/alembic-0.9.7
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/sqlalchemy-0.8.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-editor-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-0.9.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1de008f88572a12c873a2a764c9ad6e0
+_md5_=acd71e038b34f791ef8eff11e3c1eae4
diff --git a/metadata/md5-cache/dev-python/alembic-1.0.8 b/metadata/md5-cache/dev-python/alembic-1.0.8
index 1c07d82cca59..c7c32d8881e9 100644
--- a/metadata/md5-cache/dev-python/alembic-1.0.8
+++ b/metadata/md5-cache/dev-python/alembic-1.0.8
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/sqlalchemy-0.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-editor-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-1.0.8.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=06376fffdd58cd9f7740d47a59492f76
+_md5_=3e4bd955a7d06b8695c47e75a1e3965c
diff --git a/metadata/md5-cache/dev-python/algopy-0.5.3 b/metadata/md5-cache/dev-python/algopy-0.5.3
index 12f14a17723f..43d2a9bdbbc7 100644
--- a/metadata/md5-cache/dev-python/algopy-0.5.3
+++ b/metadata/md5-cache/dev-python/algopy-0.5.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/algopy/algopy-0.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c2577f7826342e4394a57adc6a28b408
+_md5_=0d88019ec0cdc416e9214eaa16ee621f
diff --git a/metadata/md5-cache/dev-python/amqplib-1.0.2-r1 b/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
index 86561b9cff09..d96ec6050ada 100644
--- a/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-3
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/amqplib/amqplib-1.0.2.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=caa24d93cbbacbb257d6e2d1b9fc355a
+_md5_=2cbc8a13b1aae3e14c4ebae1a217304b
diff --git a/metadata/md5-cache/dev-python/aniso8601-4.0.1 b/metadata/md5-cache/dev-python/aniso8601-4.0.1
index 6f050478efc3..1bb663053631 100644
--- a/metadata/md5-cache/dev-python/aniso8601-4.0.1
+++ b/metadata/md5-cache/dev-python/aniso8601-4.0.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-python/python-dateutil-2.7.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aniso8601/aniso8601-4.0.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0e30c7ecec120ecfbdf582d58bc16673
+_md5_=36cbaa5d47edfce4152a7b1467df80cf
diff --git a/metadata/md5-cache/dev-python/ansicolor-9999 b/metadata/md5-cache/dev-python/ansicolor-9999
index dbbd0f443db7..2e0fbac607eb 100644
--- a/metadata/md5-cache/dev-python/ansicolor-9999
+++ b/metadata/md5-cache/dev-python/ansicolor-9999
@@ -8,6 +8,7 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea91db8b204dc217bc13e0978080982e
+_md5_=6798f0535a75d5866c3a75adbd17b962
diff --git a/metadata/md5-cache/dev-python/ansimarkup-1.4.0 b/metadata/md5-cache/dev-python/ansimarkup-1.4.0
index 73402c47cf35..ef7d99ca4446 100644
--- a/metadata/md5-cache/dev-python/ansimarkup-1.4.0
+++ b/metadata/md5-cache/dev-python/ansimarkup-1.4.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gvalkov/python-ansimarkup/archive/v1.4.0.tar.gz -> ansimarkup-1.4.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6733cacab4175d1333cad631ac72f236
+_md5_=cf87724637964fded63cf25057dacce7
diff --git a/metadata/md5-cache/dev-python/anyjson-0.3.3-r1 b/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
index 7bcb6bd4bc3e..f3ae7e206062 100644
--- a/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
+++ b/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyjson/anyjson-0.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4fc361ae602f929bea0ed86e16fb8cc3
+_md5_=13dbb4680a0410c52a46f01b7e5e8560
diff --git a/metadata/md5-cache/dev-python/apispec-0.35.0 b/metadata/md5-cache/dev-python/apispec-0.35.0
index b9332f54f8ff..e2ba00fb84f1 100644
--- a/metadata/md5-cache/dev-python/apispec-0.35.0
+++ b/metadata/md5-cache/dev-python/apispec-0.35.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/apispec/apispec-0.35.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=615a8e7abadd2d5702fe071a5219f4d5
+_md5_=e5639c902862bee382d74cfc5ab7f541
diff --git a/metadata/md5-cache/dev-python/argh-0.26.2-r1 b/metadata/md5-cache/dev-python/argh-0.26.2-r1
index ea4b0be74dfd..e4b16797ddd5 100644
--- a/metadata/md5-cache/dev-python/argh-0.26.2-r1
+++ b/metadata/md5-cache/dev-python/argh-0.26.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=LGPL-3
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argh/argh-0.26.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99b9e4c274e09c376edd971a02766995
+_md5_=f04c2c6b0e1256c3c89b8c634b46bfd1
diff --git a/metadata/md5-cache/dev-python/argon2_cffi-19.1.0 b/metadata/md5-cache/dev-python/argon2_cffi-19.1.0
index 54239ead03de..dd70cefd1fcc 100644
--- a/metadata/md5-cache/dev-python/argon2_cffi-19.1.0
+++ b/metadata/md5-cache/dev-python/argon2_cffi-19.1.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=~app-crypt/argon2-20171227:= dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-cffi[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argon2_cffi/argon2_cffi-19.1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e4c12598b2b2dab38e51f3e96b70d138
+_md5_=9ecc8e903af901359e53891d5b15ed8c
diff --git a/metadata/md5-cache/dev-python/arrow-0.10.0 b/metadata/md5-cache/dev-python/arrow-0.10.0
index 0f919d82c212..20f1fd301e0d 100644
--- a/metadata/md5-cache/dev-python/arrow-0.10.0
+++ b/metadata/md5-cache/dev-python/arrow-0.10.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-0.10.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba664aaeeab46cb5690b50813e5c92a6
+_md5_=aa656a285490aa1218ce945498244ed9
diff --git a/metadata/md5-cache/dev-python/arrow-0.12.1 b/metadata/md5-cache/dev-python/arrow-0.12.1
index 471e207b11af..c1c343dbafdd 100644
--- a/metadata/md5-cache/dev-python/arrow-0.12.1
+++ b/metadata/md5-cache/dev-python/arrow-0.12.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-0.12.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de2f511f6218afe0429d973d0755820f
+_md5_=d468d4a3d3e4c50033f6c56d64286df2
diff --git a/metadata/md5-cache/dev-python/arrow-0.13.1 b/metadata/md5-cache/dev-python/arrow-0.13.1
index a60abf59be2f..83385acac4d7 100644
--- a/metadata/md5-cache/dev-python/arrow-0.13.1
+++ b/metadata/md5-cache/dev-python/arrow-0.13.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-0.13.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3c75885da57a093ace535e2ff34f54bf
+_md5_=56cc3623835db3b883b90455c6332ca9
diff --git a/metadata/md5-cache/dev-python/asciitable-0.8.0-r1 b/metadata/md5-cache/dev-python/asciitable-0.8.0-r1
index 74780ae37943..4454ea1ee48e 100644
--- a/metadata/md5-cache/dev-python/asciitable-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/asciitable-0.8.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/asciitable/asciitable-0.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ccafb5040a461e2fdf98b2aade5d63f
+_md5_=672bf2ca8dfdd8c04f68e6a7951b6198
diff --git a/metadata/md5-cache/dev-python/asdf-1.2.1 b/metadata/md5-cache/dev-python/asdf-1.2.1
index 4b85b3273b6f..bbc387b0561f 100644
--- a/metadata/md5-cache/dev-python/asdf-1.2.1
+++ b/metadata/md5-cache/dev-python/asdf-1.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonschema[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/asdf/asdf-1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d81efee5b317ea90fdd5c8b4a0ead50
+_md5_=3821c4299422dd109d0f51c834949cef
diff --git a/metadata/md5-cache/dev-python/asset-0.6.11 b/metadata/md5-cache/dev-python/asset-0.6.11
index fdd1fa36fe0b..a7d0708eb326 100644
--- a/metadata/md5-cache/dev-python/asset-0.6.11
+++ b/metadata/md5-cache/dev-python/asset-0.6.11
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=dev-python/aadict-0.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/globre-0.0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/asset/asset-0.6.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f8bf32f5f1483bf9a1fcf94fa4265a0
+_md5_=42f9739017d44bfd949f681c0b7ca35a
diff --git a/metadata/md5-cache/dev-python/assets-0.1.1-r1 b/metadata/md5-cache/dev-python/assets-0.1.1-r1
index 6dfea6376cd8..7d552adcf41f 100644
--- a/metadata/md5-cache/dev-python/assets-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/assets-0.1.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/web-assets/trunk/0.1.1/+download/assets-0.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ccf49b5ef9d6881a2f6487e2264fcdb
+_md5_=cd6cd80a964e6a194eec01986807e227
diff --git a/metadata/md5-cache/dev-python/astrodendro-0.2.0 b/metadata/md5-cache/dev-python/astrodendro-0.2.0
index c1ad7cedf091..300c51086963 100644
--- a/metadata/md5-cache/dev-python/astrodendro-0.2.0
+++ b/metadata/md5-cache/dev-python/astrodendro-0.2.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astrodendro/astrodendro-0.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=055da6b2b89af26b346f10503762f3bf
+_md5_=2a90aad81a80a23a6424f1aa9e265bc0
diff --git a/metadata/md5-cache/dev-python/astroid-1.6.5 b/metadata/md5-cache/dev-python/astroid-1.6.5
index b8fb81946e4f..14de4812da9c 100644
--- a/metadata/md5-cache/dev-python/astroid-1.6.5
+++ b/metadata/md5-cache/dev-python/astroid-1.6.5
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-maco
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wrapt[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-1.6.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc95b7ecd8ad7377a7d83ba8e66c6a1b
+_md5_=26583f744c222e6fea025883e93468c7
diff --git a/metadata/md5-cache/dev-python/astroid-2.2.5 b/metadata/md5-cache/dev-python/astroid-2.2.5
index 18601858e5c7..364b26572b5f 100644
--- a/metadata/md5-cache/dev-python/astroid-2.2.5
+++ b/metadata/md5-cache/dev-python/astroid-2.2.5
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wrapt[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/typed-ast-1.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-2.2.5.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dc6ccf60df0bad47277f4b69ef59edaa
+_md5_=cb850286a6f124aad5c63775f264d56f
diff --git a/metadata/md5-cache/dev-python/astroml-0.3 b/metadata/md5-cache/dev-python/astroml-0.3
index 91c0b5e26de5..57482dbc436c 100644
--- a/metadata/md5-cache/dev-python/astroml-0.3
+++ b/metadata/md5-cache/dev-python/astroml-0.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits_learn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroML/astroML-0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b273dbc96df3d9039ea8c45002a01bad
+_md5_=0f55d921b7e1a87445190b8750f20f01
diff --git a/metadata/md5-cache/dev-python/astroplan-0.2 b/metadata/md5-cache/dev-python/astroplan-0.2
index bf4748916a0e..ca26145992c1 100644
--- a/metadata/md5-cache/dev-python/astroplan-0.2
+++ b/metadata/md5-cache/dev-python/astroplan-0.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroplan/astroplan-0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e2997c29b0fe18ca657cec1d4239d24
+_md5_=38dc7f0f4144541f4acfc2723bd0ca00
diff --git a/metadata/md5-cache/dev-python/astroplan-0.2.1 b/metadata/md5-cache/dev-python/astroplan-0.2.1
index ae92a8b8714d..4b99dc150e99 100644
--- a/metadata/md5-cache/dev-python/astroplan-0.2.1
+++ b/metadata/md5-cache/dev-python/astroplan-0.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroplan/astroplan-0.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fcf6227893029aa8bc6f9cbe0c0d29b6
+_md5_=a269c9172a052276db4a8307fa271e88
diff --git a/metadata/md5-cache/dev-python/astropy-1.2.1 b/metadata/md5-cache/dev-python/astropy-1.2.1
index 084b853adb0d..f279dc7527e2 100644
--- a/metadata/md5-cache/dev-python/astropy-1.2.1
+++ b/metadata/md5-cache/dev-python/astropy-1.2.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-libs/expat:0= dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=sci-astronomy/erfa-1.2:0= >=sci-astronomy/wcslib-5:0= sci-libs/cfitsio:0= sys-libs/zlib:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astropy/astropy-1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=65c991248a36efa1973b00f22689e0d4
+_md5_=d0a596c5f3d27587b767b0845c335069
diff --git a/metadata/md5-cache/dev-python/astropy-1.3.3 b/metadata/md5-cache/dev-python/astropy-1.3.3
index c38dc3dbd0e7..6c11f1827dcc 100644
--- a/metadata/md5-cache/dev-python/astropy-1.3.3
+++ b/metadata/md5-cache/dev-python/astropy-1.3.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-libs/expat:0= dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-astronomy/erfa-1.3:0= >=sci-astronomy/wcslib-5:0= >=sci-libs/cfitsio-3.410:0= sys-libs/zlib:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astropy/astropy-1.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ad6dac6c26933f568af449d190ca763
+_md5_=fa889a7831e798118206424996f34a5c
diff --git a/metadata/md5-cache/dev-python/astropy-2.0.1 b/metadata/md5-cache/dev-python/astropy-2.0.1
index 394057ccdf15..6d40285746e1 100644
--- a/metadata/md5-cache/dev-python/astropy-2.0.1
+++ b/metadata/md5-cache/dev-python/astropy-2.0.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-libs/expat:0= dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jplephem[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libxml2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/objgraph[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),jpeg(+)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-astronomy/erfa-1.3:0= >=sci-astronomy/wcslib-5:0= >=sci-libs/cfitsio-3.410:0= sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/zlib:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astropy/astropy-2.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=398078ba1e832ca23390ea87653e9c29
+_md5_=fcc8fc3b5589bfcbe588a1daf4bd25a5
diff --git a/metadata/md5-cache/dev-python/astroquery-0.3.6 b/metadata/md5-cache/dev-python/astroquery-0.3.6
index ec9e8468115a..f0f26642048b 100644
--- a/metadata/md5-cache/dev-python/astroquery-0.3.6
+++ b/metadata/md5-cache/dev-python/astroquery-0.3.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/astropy-helpers[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/astropy/astroquery/archive/v0.3.6.tar.gz -> astroquery-0.3.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9ae924366b193c315c420735e8dcef7
+_md5_=517f28c9a7f92ed2709aa9a5894a8109
diff --git a/metadata/md5-cache/dev-python/astroscrappy-1.0.3 b/metadata/md5-cache/dev-python/astroscrappy-1.0.3
index 62cd51d220b2..81acb4699ece 100644
--- a/metadata/md5-cache/dev-python/astroscrappy-1.0.3
+++ b/metadata/md5-cache/dev-python/astroscrappy-1.0.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/astropy-helpers[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroscrappy/astroscrappy-1.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b46450b0e76969c43c608bb22e2abb01
+_md5_=95671347dd17fd04a8987f2b23a4376c
diff --git a/metadata/md5-cache/dev-python/astroscrappy-1.0.5 b/metadata/md5-cache/dev-python/astroscrappy-1.0.5
index 4d2d9b0e0da4..a9610f5fa115 100644
--- a/metadata/md5-cache/dev-python/astroscrappy-1.0.5
+++ b/metadata/md5-cache/dev-python/astroscrappy-1.0.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/astropy-helpers[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroscrappy/astroscrappy-1.0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d128e53cd4a599a1ae026d397ff9e9e5
+_md5_=6a7aaee7954eba555ba5b29532cfe4ce
diff --git a/metadata/md5-cache/dev-python/async_timeout-1.2.1 b/metadata/md5-cache/dev-python/async_timeout-1.2.1
index 7bd2833b7ee6..0f60af2f83df 100644
--- a/metadata/md5-cache/dev-python/async_timeout-1.2.1
+++ b/metadata/md5-cache/dev-python/async_timeout-1.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a9bdff0bb82ea7d78c4fe7cf15d6a1b
+_md5_=d0389e995988174eef3a2b67bbc9a058
diff --git a/metadata/md5-cache/dev-python/autobahn-17.10.1 b/metadata/md5-cache/dev-python/autobahn-17.10.1
index d8575cc8d001..0765c5e08da5 100644
--- a/metadata/md5-cache/dev-python/autobahn-17.10.1
+++ b/metadata/md5-cache/dev-python/autobahn-17.10.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lz4-0.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-ubjson-0.8.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snappy-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.6.0-r2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wsaccel-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-3.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-16.0.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-17.10.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ebc25ec3e4091840f9f131036f11df3
+_md5_=f51af73701e177b62506d8dbed11d2eb
diff --git a/metadata/md5-cache/dev-python/autobahn-17.5.1-r2 b/metadata/md5-cache/dev-python/autobahn-17.5.1-r2
index a58ce5b4173f..9cba137c525b 100644
--- a/metadata/md5-cache/dev-python/autobahn-17.5.1-r2
+++ b/metadata/md5-cache/dev-python/autobahn-17.5.1-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lz4-0.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-16.0.0 ) >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snappy-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.6.0-r2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-ubjson-0.8.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wsaccel-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-3.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-17.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68dacba1813ed915487b84344656a597
+_md5_=e1f25e983239c1ba0e194e49bef45f1e
diff --git a/metadata/md5-cache/dev-python/autobahn-17.9.1 b/metadata/md5-cache/dev-python/autobahn-17.9.1
index 6903f36f3bea..193b91498dba 100644
--- a/metadata/md5-cache/dev-python/autobahn-17.9.1
+++ b/metadata/md5-cache/dev-python/autobahn-17.9.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lz4-0.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-ubjson-0.8.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snappy-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.6.0-r2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wsaccel-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-3.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-16.0.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-17.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ebc25ec3e4091840f9f131036f11df3
+_md5_=f51af73701e177b62506d8dbed11d2eb
diff --git a/metadata/md5-cache/dev-python/autobahn-17.9.2 b/metadata/md5-cache/dev-python/autobahn-17.9.2
index 8710642832dd..eb7b18be35b9 100644
--- a/metadata/md5-cache/dev-python/autobahn-17.9.2
+++ b/metadata/md5-cache/dev-python/autobahn-17.9.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lz4-0.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-ubjson-0.8.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snappy-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.6.0-r2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wsaccel-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-3.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-16.0.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-17.9.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ebc25ec3e4091840f9f131036f11df3
+_md5_=f51af73701e177b62506d8dbed11d2eb
diff --git a/metadata/md5-cache/dev-python/autobahn-18.3.1 b/metadata/md5-cache/dev-python/autobahn-18.3.1
index 2e70c70e4965..58cdf0a5b1f0 100644
--- a/metadata/md5-cache/dev-python/autobahn-18.3.1
+++ b/metadata/md5-cache/dev-python/autobahn-18.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lz4-0.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-ubjson-0.8.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snappy-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.6.0-r2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wsaccel-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-3.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-16.0.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-18.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a3d9586b59f3881d1e08d5e4a216af0
+_md5_=7bfd2b364507e8b3c63c1a3ed24e35af
diff --git a/metadata/md5-cache/dev-python/automat-0.5.0 b/metadata/md5-cache/dev-python/automat-0.5.0
index 24c62a1564ba..3ac7c25f1b34 100644
--- a/metadata/md5-cache/dev-python/automat-0.5.0
+++ b/metadata/md5-cache/dev-python/automat-0.5.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/attrs[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-0.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=666cef6d7dafed02e74368b5d11d3300
+_md5_=92ba0453eb9fe2be8cfd0978a7180fb6
diff --git a/metadata/md5-cache/dev-python/automat-0.6.0 b/metadata/md5-cache/dev-python/automat-0.6.0
index 1940734190ba..6e3663abab0b 100644
--- a/metadata/md5-cache/dev-python/automat-0.6.0
+++ b/metadata/md5-cache/dev-python/automat-0.6.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/attrs[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-0.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7004c6efcd7af2a5a2382a4050db3d1a
+_md5_=5ad1375a208cb755f910c4c6afa30321
diff --git a/metadata/md5-cache/dev-python/automat-0.7.0 b/metadata/md5-cache/dev-python/automat-0.7.0
index 8743268cadac..7d34d2caaacd 100644
--- a/metadata/md5-cache/dev-python/automat-0.7.0
+++ b/metadata/md5-cache/dev-python/automat-0.7.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=MIT
 RDEPEND=dev-python/attrs[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-0.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34306ae99951941dbbd22e6ce6b6ba51
+_md5_=0d1b4176f4f0d07e2f9286d7cf66b34e
diff --git a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.3 b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.3
index b3437adb834f..ab65c4335968 100644
--- a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.3
+++ b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.functools_lru_cache/backports.functools_lru_cache-1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c99a51a3cf1355c646c60ccc4da7c78
+_md5_=584e21b3ce3101417d841a7933854e86
diff --git a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4-r1 b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4-r1
index a5647440123d..005c1f93e998 100644
--- a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4-r1
+++ b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.4-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4525baa7cddcdbfc7976d4be111cefdb
+_md5_=e107b99e34ccc04e816c6a2887b63be1
diff --git a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.5 b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.5
index 16c6afad18cc..aa9801446ed4 100644
--- a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.5
+++ b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.5
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~am
 LICENSE=MIT
 RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.functools_lru_cache/backports.functools_lru_cache-1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b60fa8c88ee556861c7d02889ef89062
+_md5_=f57ccc6979c4bdc6768feffae8f813d7
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.10 b/metadata/md5-cache/dev-python/backports-lzma-0.0.10
index 0eeeb6eb6e5f..86bdd2dfabdd 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.10
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.10
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=BSD
 RDEPEND=app-arch/xz-utils:0= dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f5cd1619fffa891bf5dbf8bd8b0fddd
+_md5_=16ee1acec9c58c1dcd03f58b1bbeea8a
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.12 b/metadata/md5-cache/dev-python/backports-lzma-0.0.12
index 9a5c8c691529..bd44e106d024 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.12
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.12
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=app-arch/xz-utils:0= dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=710e3f17dfa92ce52f71e5944cfab077
+_md5_=fe13cc6de627618d60e720293b4ea6dc
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.13 b/metadata/md5-cache/dev-python/backports-lzma-0.0.13
index e044f5a3900b..2e9f989c9462 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.13
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.13
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=app-arch/xz-utils:0= dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.13.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1945489d554da6f8d60512ba781b40ae
+_md5_=a0a53b5cd6c3433bb7681658b9032661
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.3 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
index 552db4679e37..c8a894e0ce0f 100644
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=056234f17e7f51e6c7ff5cd11cea18a3
+_md5_=37120d5766dcad682cf7efc7db355c19
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.4 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.4
index a801fc3955bd..1cf625b2fa07 100644
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.4
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.4
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9c7b5e0d47755b1f240d74f1910ec643
+_md5_=6075eef4598e5b7b192b2274650f1404
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.5 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.5
index ff4e03846f03..097e8e083f9f 100644
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.5
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.5
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.5.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8cae32d303951d16650db545f5c14367
+_md5_=d5e668539083aa0f073ced86c1731623
diff --git a/metadata/md5-cache/dev-python/bcolz-1.1.0 b/metadata/md5-cache/dev-python/bcolz-1.1.0
index 07b5bd77f6c9..925ac5d0c85f 100644
--- a/metadata/md5-cache/dev-python/bcolz-1.1.0
+++ b/metadata/md5-cache/dev-python/bcolz-1.1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/numexpr-1.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bcolz/bcolz-1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=610d6718f9f9fb9d065269b78fe2bff4
+_md5_=5842a20f209318fa68c14b84ed6e1613
diff --git a/metadata/md5-cache/dev-python/bcolz-1.1.2 b/metadata/md5-cache/dev-python/bcolz-1.1.2
index 5de4bdd2e589..3376d19e515f 100644
--- a/metadata/md5-cache/dev-python/bcolz-1.1.2
+++ b/metadata/md5-cache/dev-python/bcolz-1.1.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-libs/c-blosc:= dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bcolz/bcolz-1.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61276d0bb8d4080dbd491eb21524b862
+_md5_=ce36514a150bd378f796ab5005c71e80
diff --git a/metadata/md5-cache/dev-python/bcrypt-3.1.6 b/metadata/md5-cache/dev-python/bcrypt-3.1.6
index bb7de2c4dfe2..f4017f8e9c96 100644
--- a/metadata/md5-cache/dev-python/bcrypt-3.1.6
+++ b/metadata/md5-cache/dev-python/bcrypt-3.1.6
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !dev-python/py-bcrypt python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bcrypt/bcrypt-3.1.6.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b52cabdb9c7d8aa5b814435141e5ad05
+_md5_=899f27eebd6b7e168a2a13af90f6c804
diff --git a/metadata/md5-cache/dev-python/beaker-1.6.4-r1 b/metadata/md5-cache/dev-python/beaker-1.6.4-r1
index cf6486e338fa..ce9afe74a88d 100644
--- a/metadata/md5-cache/dev-python/beaker-1.6.4-r1
+++ b/metadata/md5-cache/dev-python/beaker-1.6.4-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-l
 LICENSE=BSD
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/Beaker/Beaker-1.6.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a3e4de1f96e810ad746c9dd2131baf0b
+_md5_=053f1c966919410327a25599d710a4f4
diff --git a/metadata/md5-cache/dev-python/beaker-1.8.1 b/metadata/md5-cache/dev-python/beaker-1.8.1
index f04e99a8b405..729341895b22 100644
--- a/metadata/md5-cache/dev-python/beaker-1.8.1
+++ b/metadata/md5-cache/dev-python/beaker-1.8.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-
 LICENSE=BSD
 RDEPEND=virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bbangert/beaker/archive/1.8.1.tar.gz -> beaker-1.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=810f27f8882fdf4884af16c772c2c3fc
+_md5_=385fa5d6df8862d7c51dfc4c382184ec
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.5.1 b/metadata/md5-cache/dev-python/beautifulsoup-4.5.1
index a138be112931..989ffa62513b 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.5.1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.5.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( dev-python/html5lib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/html5lib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f78808dee8fefacb24a7157c6c74824
+_md5_=eeb6bc809bde41eb7be03c23447d2bb8
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.6.3 b/metadata/md5-cache/dev-python/beautifulsoup-4.6.3
index 5955ca526994..ff2d7f350b3e 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.6.3
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.6.3
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( dev-python/html5lib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/html5lib[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.6.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b88049c3e89423c3144ebc1448d23012
+_md5_=17dadfbcb3f73bd4ef7b381ccd5204af
diff --git a/metadata/md5-cache/dev-python/bibtexparser-0.6.2 b/metadata/md5-cache/dev-python/bibtexparser-0.6.2
index 076bde09f699..948254f10b44 100644
--- a/metadata/md5-cache/dev-python/bibtexparser-0.6.2
+++ b/metadata/md5-cache/dev-python/bibtexparser-0.6.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( BSD LGPL-3 )
 RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sciunto-org/python-bibtexparser/archive/v0.6.2.tar.gz -> bibtexparser-0.6.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c15d87068738114e55f8bd33eaa625d4
+_md5_=4fe11a35d94c7f17282f0d9cf9218e47
diff --git a/metadata/md5-cache/dev-python/bibtexparser-1.1.0 b/metadata/md5-cache/dev-python/bibtexparser-1.1.0
index 0bb6a6347021..1c225edfd39b 100644
--- a/metadata/md5-cache/dev-python/bibtexparser-1.1.0
+++ b/metadata/md5-cache/dev-python/bibtexparser-1.1.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( BSD LGPL-3 )
 RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sciunto-org/python-bibtexparser/archive/v1.1.0.tar.gz -> bibtexparser-1.1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0161571f20f9a9366ef7b119db9db2de
+_md5_=621412816edbdb2ce8777247cfe09755
diff --git a/metadata/md5-cache/dev-python/billiard-3.3.0.23 b/metadata/md5-cache/dev-python/billiard-3.3.0.23
index be3f935f832c..30adb75a4f0b 100644
--- a/metadata/md5-cache/dev-python/billiard-3.3.0.23
+++ b/metadata/md5-cache/dev-python/billiard-3.3.0.23
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-3.3.0.23.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=006fdc89f6bc94260f9d6933453f82d9
+_md5_=f61673ae7b047128130035d8ba3e58f7
diff --git a/metadata/md5-cache/dev-python/billiard-3.5.0.0 b/metadata/md5-cache/dev-python/billiard-3.5.0.0
index 09f189ffdb17..08eec15cf722 100644
--- a/metadata/md5-cache/dev-python/billiard-3.5.0.0
+++ b/metadata/md5-cache/dev-python/billiard-3.5.0.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-3.5.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9ac2de1fbbe26a1d3c9dabc5afd34b4
+_md5_=f43f5b2ee6b6831b6fc14474a4455337
diff --git a/metadata/md5-cache/dev-python/billiard-3.5.0.2 b/metadata/md5-cache/dev-python/billiard-3.5.0.2
index a9e6d54489b1..a67e9dec1737 100644
--- a/metadata/md5-cache/dev-python/billiard-3.5.0.2
+++ b/metadata/md5-cache/dev-python/billiard-3.5.0.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-3.5.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5f7afa12eedb3e915c7c0ade64583583
+_md5_=f23e390103448ffedff59b0e46c7789e
diff --git a/metadata/md5-cache/dev-python/binaryornot-0.4.3 b/metadata/md5-cache/dev-python/binaryornot-0.4.3
index 189114c05c58..b29f0e876bd0 100644
--- a/metadata/md5-cache/dev-python/binaryornot-0.4.3
+++ b/metadata/md5-cache/dev-python/binaryornot-0.4.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=>=dev-python/chardet-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/audreyr/binaryornot/archive/0.4.3.tar.gz -> binaryornot-0.4.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=291c38a8e9b3f04be230984cce159278
+_md5_=31e611595b34cceabf147c03f219eab4
diff --git a/metadata/md5-cache/dev-python/biplist-1.0.1 b/metadata/md5-cache/dev-python/biplist-1.0.1
index 45aabc3b8188..73c712380133 100644
--- a/metadata/md5-cache/dev-python/biplist-1.0.1
+++ b/metadata/md5-cache/dev-python/biplist-1.0.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/biplist/biplist-1.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b98752c36aedc372ed84c219d81bd10c
+_md5_=930639d6740e0c7766e27f2783d719f9
diff --git a/metadata/md5-cache/dev-python/biplist-1.0.2 b/metadata/md5-cache/dev-python/biplist-1.0.2
index 357a3030c6b9..f6f3748fc167 100644
--- a/metadata/md5-cache/dev-python/biplist-1.0.2
+++ b/metadata/md5-cache/dev-python/biplist-1.0.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/biplist/biplist-1.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8346b02ec73d8f6355e281980500415f
+_md5_=1d3b06a219952cbf59b3cc0a80e74f4d
diff --git a/metadata/md5-cache/dev-python/blaze-0.10.2 b/metadata/md5-cache/dev-python/blaze-0.10.2
index e51e398d5f0d..1164f2c82a01 100644
--- a/metadata/md5-cache/dev-python/blaze-0.10.2
+++ b/metadata/md5-cache/dev-python/blaze-0.10.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/datashape[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/dynd-python-0.6.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/toolz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/cytoolz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pandas-0.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/unicodecsv[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/multipledispatch-0.4.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/flask-cors[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pymongo-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/into[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/numba[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/bcolz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/odo-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ContinuumIO/blaze/archive/0.10.2.tar.gz -> blaze-0.10.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a428cc6ef9ad60da41dfe8a0ff1da96
+_md5_=db0c2097eac5926859440f86b32a2029
diff --git a/metadata/md5-cache/dev-python/blaze-0.11.3 b/metadata/md5-cache/dev-python/blaze-0.11.3
index e6dc0a0ad4f1..a69405f6b70e 100644
--- a/metadata/md5-cache/dev-python/blaze-0.11.3
+++ b/metadata/md5-cache/dev-python/blaze-0.11.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/bcolz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cytoolz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/datashape[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dynd-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask-cors[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/into[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/multipledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numba[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/odo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytables[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/toolz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unicodecsv[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blaze/blaze/archive/0.11.3.tar.gz -> blaze-0.11.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c0a9ffc71e961eb3ceb082373a2d5f5
+_md5_=9a57800ed24172307f0b02550d21e168
diff --git a/metadata/md5-cache/dev-python/bleach-2.1.3 b/metadata/md5-cache/dev-python/bleach-2.1.3
index 7abd5012bbbd..a410e7127752 100644
--- a/metadata/md5-cache/dev-python/bleach-2.1.3
+++ b/metadata/md5-cache/dev-python/bleach-2.1.3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/html5lib-0.99999999[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-2.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=906b8bd6749b94ae0e357edba32c8771
+_md5_=e47e4ddb5f78b0c7949f37c0cf96916e
diff --git a/metadata/md5-cache/dev-python/bleach-3.0.2 b/metadata/md5-cache/dev-python/bleach-3.0.2
index ca577af90c55..967ed1b06604 100644
--- a/metadata/md5-cache/dev-python/bleach-3.0.2
+++ b/metadata/md5-cache/dev-python/bleach-3.0.2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/webencodings[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-3.0.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=776977ee044c8ee92813eef707128e0f
+_md5_=341e60682ec2f95dd93e2c2f52d0ae10
diff --git a/metadata/md5-cache/dev-python/blessings-1.6-r1 b/metadata/md5-cache/dev-python/blessings-1.6-r1
index 4a228af8c954..922bfafd6d96 100644
--- a/metadata/md5-cache/dev-python/blessings-1.6-r1
+++ b/metadata/md5-cache/dev-python/blessings-1.6-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blessings/blessings-1.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fac917bbfff2c09c9f363154dc82c68d
+_md5_=9c0ed9623de7ea4f253844a270f6d9df
diff --git a/metadata/md5-cache/dev-python/blessings-1.6.1 b/metadata/md5-cache/dev-python/blessings-1.6.1
index b6d5d00ab949..b68ad0ebbec6 100644
--- a/metadata/md5-cache/dev-python/blessings-1.6.1
+++ b/metadata/md5-cache/dev-python/blessings-1.6.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blessings/blessings-1.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a572fae903bb460b0013a485ea2022cc
+_md5_=cdd6bde44306e0e46044be5b17a5ff0a
diff --git a/metadata/md5-cache/dev-python/blessings-1.7 b/metadata/md5-cache/dev-python/blessings-1.7
index 10d857f6a41c..476f91666b84 100644
--- a/metadata/md5-cache/dev-python/blessings-1.7
+++ b/metadata/md5-cache/dev-python/blessings-1.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erikrose/blessings/archive/1.7.tar.gz -> blessings-1.7.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=22aa1da8b4498b8483a3e30315d17cda
+_md5_=1388aee5e5e3bb61bdfce8d5738eaf4b
diff --git a/metadata/md5-cache/dev-python/blockdiag-1.5.3-r1 b/metadata/md5-cache/dev-python/blockdiag-1.5.3-r1
index 9530b3cb71e4..cb6adde4eef9 100644
--- a/metadata/md5-cache/dev-python/blockdiag-1.5.3-r1
+++ b/metadata/md5-cache/dev-python/blockdiag-1.5.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/funcparserlib-0.3.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pillow-2.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/webcolors[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blockdiag/blockdiag-1.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fcd667d72642bcd6d3df62f0f4d8a878
+_md5_=ba83182313d5dc44496ce44c628b627b
diff --git a/metadata/md5-cache/dev-python/blosc-1.2.8 b/metadata/md5-cache/dev-python/blosc-1.2.8
index 4d71302d87ff..dc067c49c6ba 100644
--- a/metadata/md5-cache/dev-python/blosc-1.2.8
+++ b/metadata/md5-cache/dev-python/blosc-1.2.8
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/c-blosc-1.3.5 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blosc/blosc-1.2.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=171b12ca7d288fb7707a878fde14f53f
+_md5_=4c77aed0eb89d5b2abec442368e23c67
diff --git a/metadata/md5-cache/dev-python/blosc-1.4.4 b/metadata/md5-cache/dev-python/blosc-1.4.4
index 0c756b5dfc78..fc6d408ac49d 100644
--- a/metadata/md5-cache/dev-python/blosc-1.4.4
+++ b/metadata/md5-cache/dev-python/blosc-1.4.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/c-blosc:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blosc/blosc-1.4.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=387571224c339d0d208f45cbbd3cb4f2
+_md5_=af68e353c6c2a5440a0977aa001cb133
diff --git a/metadata/md5-cache/dev-python/blosc-1.5.0 b/metadata/md5-cache/dev-python/blosc-1.5.0
index a732f2a13c6c..7cf0c3dc2e7a 100644
--- a/metadata/md5-cache/dev-python/blosc-1.5.0
+++ b/metadata/md5-cache/dev-python/blosc-1.5.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/c-blosc:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blosc/blosc-1.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6031ed54f9b3ddfb25f18db8a53ff4db
+_md5_=8135e24ae02aafd7dadb4e8ab63ba65a
diff --git a/metadata/md5-cache/dev-python/blosc-1.5.1 b/metadata/md5-cache/dev-python/blosc-1.5.1
index 0f3b52f1a6bc..ec2d225b9084 100644
--- a/metadata/md5-cache/dev-python/blosc-1.5.1
+++ b/metadata/md5-cache/dev-python/blosc-1.5.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/c-blosc:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blosc/blosc-1.5.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=89ed0bc6f88fa132a3d4334ca63b0096
+_md5_=c487f47b31ade547e0ea6359603d987d
diff --git a/metadata/md5-cache/dev-python/bokeh-0.11.1 b/metadata/md5-cache/dev-python/bokeh-0.11.1
index 7c3ec22c264f..6b55d7bcb38d 100644
--- a/metadata/md5-cache/dev-python/bokeh-0.11.1
+++ b/metadata/md5-cache/dev-python/bokeh-0.11.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/abstract_rendering[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/colorama-0.2.7[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/flask-0.10.1[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/jinja-2.7[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/numpy-1.7.1[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/pandas-0.11[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/python-dateutil-2.1[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/pyzmq-14.3.1[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/redis-py-2.7.6[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/requests-1.2.3[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/six-1.5.2[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/websocket-client[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/werkzeug-0.9.1[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=www-servers/tornado-4.0.1[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bokeh/bokeh-0.11.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89bd80af06b28bf6aa9e45d74037d0ac
+_md5_=729ee7ec365d4fd62bc6b2976ee2f79d
diff --git a/metadata/md5-cache/dev-python/bokeh-0.12.6 b/metadata/md5-cache/dev-python/bokeh-0.12.6
index c401e7d7b491..680352e9b778 100644
--- a/metadata/md5-cache/dev-python/bokeh-0.12.6
+++ b/metadata/md5-cache/dev-python/bokeh-0.12.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/jinja[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bokeh/bokeh-0.12.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99a1c47be09ce32d9bbb99229b459afe
+_md5_=0d32b1025a6b1a34dde0544895bc12c3
diff --git a/metadata/md5-cache/dev-python/boto3-1.10.2 b/metadata/md5-cache/dev-python/boto3-1.10.2
index e1899b0ecbe1..ec165b33fd00 100644
--- a/metadata/md5-cache/dev-python/boto3-1.10.2
+++ b/metadata/md5-cache/dev-python/boto3-1.10.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.12.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jmespath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/s3transfer[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.10.2.tar.gz -> boto3-1.10.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb0168ec2449d4d512756bf187f2b1ab
+_md5_=ffd8266b2ac298a16984772d66ec5caf
diff --git a/metadata/md5-cache/dev-python/boto3-1.9.122 b/metadata/md5-cache/dev-python/boto3-1.9.122
index 4f9552b943bd..bf787ba514f5 100644
--- a/metadata/md5-cache/dev-python/boto3-1.9.122
+++ b/metadata/md5-cache/dev-python/boto3-1.9.122
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.12.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jmespath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/s3transfer[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.9.122.tar.gz -> boto3-1.9.122.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ae3a10b718af7bcb250c33667ef1ff9
+_md5_=91885e6342ce6057c00e39e9bef83ebe
diff --git a/metadata/md5-cache/dev-python/boto3-1.9.4-r1 b/metadata/md5-cache/dev-python/boto3-1.9.4-r1
index 414ae6c2eb19..13487b9a9dfe 100644
--- a/metadata/md5-cache/dev-python/boto3-1.9.4-r1
+++ b/metadata/md5-cache/dev-python/boto3-1.9.4-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.12.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jmespath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/s3transfer[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.9.4.tar.gz -> boto3-1.9.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ae3a10b718af7bcb250c33667ef1ff9
+_md5_=91885e6342ce6057c00e39e9bef83ebe
diff --git a/metadata/md5-cache/dev-python/boto3-9999 b/metadata/md5-cache/dev-python/boto3-9999
index 9ae57da7901e..79c9bfbaba4f 100644
--- a/metadata/md5-cache/dev-python/boto3-9999
+++ b/metadata/md5-cache/dev-python/boto3-9999
@@ -8,6 +8,7 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=dev-python/botocore-1.12.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jmespath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/s3transfer[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb0168ec2449d4d512756bf187f2b1ab
+_md5_=ffd8266b2ac298a16984772d66ec5caf
diff --git a/metadata/md5-cache/dev-python/botocore-1.12.122 b/metadata/md5-cache/dev-python/botocore-1.12.122
index 0a47ccc1728e..2b58a4db864b 100644
--- a/metadata/md5-cache/dev-python/botocore-1.12.122
+++ b/metadata/md5-cache/dev-python/botocore-1.12.122
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jmespath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.12.122.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=917a3f45d9c8a5ed48aeacf96e555b83
+_md5_=84dd68008c174423fd6de48dce588f5e
diff --git a/metadata/md5-cache/dev-python/botocore-1.12.205 b/metadata/md5-cache/dev-python/botocore-1.12.205
index 56b3055ceb24..051d65e36a1c 100644
--- a/metadata/md5-cache/dev-python/botocore-1.12.205
+++ b/metadata/md5-cache/dev-python/botocore-1.12.205
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jmespath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.12.205.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=80307aa09b49fb169eefeba440172a5d
+_md5_=db8f93c54d91c54b7c1470b42b8259a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.12.210 b/metadata/md5-cache/dev-python/botocore-1.12.210
index 55bca979a29e..463c5e23c697 100644
--- a/metadata/md5-cache/dev-python/botocore-1.12.210
+++ b/metadata/md5-cache/dev-python/botocore-1.12.210
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jmespath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.12.210.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=80307aa09b49fb169eefeba440172a5d
+_md5_=db8f93c54d91c54b7c1470b42b8259a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.12.223 b/metadata/md5-cache/dev-python/botocore-1.12.223
index dea1fa411bd7..72974a9317a4 100644
--- a/metadata/md5-cache/dev-python/botocore-1.12.223
+++ b/metadata/md5-cache/dev-python/botocore-1.12.223
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jmespath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.12.223.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=80307aa09b49fb169eefeba440172a5d
+_md5_=db8f93c54d91c54b7c1470b42b8259a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.12.251 b/metadata/md5-cache/dev-python/botocore-1.12.251
index f10cbf9eda21..ae87a0016067 100644
--- a/metadata/md5-cache/dev-python/botocore-1.12.251
+++ b/metadata/md5-cache/dev-python/botocore-1.12.251
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/docutils-0.16[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/jmespath-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.12.251.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3734d9a3466afd3ee9979903ceecf807
+_md5_=89fca10db46175b0cea10a1698d4e1b1
diff --git a/metadata/md5-cache/dev-python/botocore-1.12.4-r1 b/metadata/md5-cache/dev-python/botocore-1.12.4-r1
index e72ee0545564..6d341fb8b53c 100644
--- a/metadata/md5-cache/dev-python/botocore-1.12.4-r1
+++ b/metadata/md5-cache/dev-python/botocore-1.12.4-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jmespath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.12.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=917a3f45d9c8a5ed48aeacf96e555b83
+_md5_=84dd68008c174423fd6de48dce588f5e
diff --git a/metadata/md5-cache/dev-python/botocore-1.12.81 b/metadata/md5-cache/dev-python/botocore-1.12.81
index 6bc5fd60b4a9..aeeca579f4dc 100644
--- a/metadata/md5-cache/dev-python/botocore-1.12.81
+++ b/metadata/md5-cache/dev-python/botocore-1.12.81
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jmespath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.12.81.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=80307aa09b49fb169eefeba440172a5d
+_md5_=db8f93c54d91c54b7c1470b42b8259a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.13.2 b/metadata/md5-cache/dev-python/botocore-1.13.2
index 26706e563b2b..c6b4ac42cdb4 100644
--- a/metadata/md5-cache/dev-python/botocore-1.13.2
+++ b/metadata/md5-cache/dev-python/botocore-1.13.2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jmespath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.13.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=80307aa09b49fb169eefeba440172a5d
+_md5_=db8f93c54d91c54b7c1470b42b8259a4
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.12 b/metadata/md5-cache/dev-python/bottle-0.12.12
index 4985e3a2427c..7a88bb17d74c 100644
--- a/metadata/md5-cache/dev-python/bottle-0.12.12
+++ b/metadata/md5-cache/dev-python/bottle-0.12.12
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.12.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f764cd8b85c594a64162f1857ea0d68a
+_md5_=85e7c4157e28b923c55c85049bdccf67
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.13 b/metadata/md5-cache/dev-python/bottle-0.12.13
index f1b0d3d59320..ab3ae7348e96 100644
--- a/metadata/md5-cache/dev-python/bottle-0.12.13
+++ b/metadata/md5-cache/dev-python/bottle-0.12.13
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.12.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bee66fc14731f33a1a33ddaf756c98a9
+_md5_=43c02efbe9652f0f32f65d77fff381e7
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.16 b/metadata/md5-cache/dev-python/bottle-0.12.16
index e7e293606c8b..56a0ca7784c9 100644
--- a/metadata/md5-cache/dev-python/bottle-0.12.16
+++ b/metadata/md5-cache/dev-python/bottle-0.12.16
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.12.16.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bee66fc14731f33a1a33ddaf756c98a9
+_md5_=43c02efbe9652f0f32f65d77fff381e7
diff --git a/metadata/md5-cache/dev-python/bottleneck-1.2.1 b/metadata/md5-cache/dev-python/bottleneck-1.2.1
index 3c3761ab470b..a77ec6718494 100644
--- a/metadata/md5-cache/dev-python/bottleneck-1.2.1
+++ b/metadata/md5-cache/dev-python/bottleneck-1.2.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kwgoodman/bottleneck/archive/v1.2.1.tar.gz -> bottleneck-1.2.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2935f5c72629debaa5348ad7e6878cf8
+_md5_=65f8d5e2c0f91a3a4ffb059586a58ef8
diff --git a/metadata/md5-cache/dev-python/buzhug-1.8-r1 b/metadata/md5-cache/dev-python/buzhug-1.8-r1
index 90b71ff9bb6b..70bc07d57e8c 100644
--- a/metadata/md5-cache/dev-python/buzhug-1.8-r1
+++ b/metadata/md5-cache/dev-python/buzhug-1.8-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/buzhug/buzhug-1.8.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fea1362484f666f1cb30ec5d97a425f
+_md5_=52243a2e9b8cb075431300815e2e6836
diff --git a/metadata/md5-cache/dev-python/cached-property-1.3.1 b/metadata/md5-cache/dev-python/cached-property-1.3.1
index fd5a9723378d..91a355906ca0 100644
--- a/metadata/md5-cache/dev-python/cached-property-1.3.1
+++ b/metadata/md5-cache/dev-python/cached-property-1.3.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cached-property/cached-property-1.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e307029fa1be6692ad1b91952ff17ecb
+_md5_=56ddd2c7c4a6a15067a499c5071726b4
diff --git a/metadata/md5-cache/dev-python/cached-property-1.5.1 b/metadata/md5-cache/dev-python/cached-property-1.5.1
index 5c44cbe71a25..2261e4a00a2a 100644
--- a/metadata/md5-cache/dev-python/cached-property-1.5.1
+++ b/metadata/md5-cache/dev-python/cached-property-1.5.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cached-property/cached-property-1.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9256545eb33ce0aadc6d2bc63e81ebec
+_md5_=ef13250b43304bcbf062700d0bf629e9
diff --git a/metadata/md5-cache/dev-python/cairocffi-0.8.0 b/metadata/md5-cache/dev-python/cairocffi-0.8.0
index e827ce360025..11b08956562e 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.8.0
+++ b/metadata/md5-cache/dev-python/cairocffi-0.8.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/xcffib-0.3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/cairo:0=[xcb] x11-libs/gdk-pixbuf[jpeg] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-0.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78f600b759554d5a10b735945dea0174
+_md5_=4ff1e4d3407a104a071313249a717d4b
diff --git a/metadata/md5-cache/dev-python/cairocffi-0.9.0 b/metadata/md5-cache/dev-python/cairocffi-0.9.0
index a078db86d6d0..a16e3868f93c 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.9.0
+++ b/metadata/md5-cache/dev-python/cairocffi-0.9.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/xcffib-0.3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/cairo:0=[xcb] x11-libs/gdk-pixbuf[jpeg] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-0.9.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=208112097465dab7302059aa3f9cc61f
+_md5_=f83c62ecc790feb76ee2b2104c4630d8
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.0.2 b/metadata/md5-cache/dev-python/cairocffi-1.0.2
index c06071e7cb07..e188c11b900c 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.0.2
+++ b/metadata/md5-cache/dev-python/cairocffi-1.0.2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/xcffib-0.3.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/cairo:0=[xcb] x11-libs/gdk-pixbuf[jpeg] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-1.0.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=5528bb6d7fb706d186e38d625a563161
+_md5_=d6a497bb062a744b8396e8743d1fe73d
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.12 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.12
index 2ea930413031..292e055ba6c9 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.12
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.4.12
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-util/catkin-0.7.14 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.12.tar.gz -> catkin_pkg-0.4.12-gh.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7937f164e274ef90f3ae9fcf84d5faee
+_md5_=15cc4140233b893c24e3cd714c92f282
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.13 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.13
index fd519e01b79f..cf10758aafe0 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.13
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.4.13
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-util/catkin-0.7.14 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.13.tar.gz -> catkin_pkg-0.4.13-gh.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7937f164e274ef90f3ae9fcf84d5faee
+_md5_=15cc4140233b893c24e3cd714c92f282
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-9999 b/metadata/md5-cache/dev-python/catkin_pkg-9999
index 7e3193e546af..d3714518112c 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-9999
+++ b/metadata/md5-cache/dev-python/catkin_pkg-9999
@@ -9,6 +9,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-util/catkin-0.7.14 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7937f164e274ef90f3ae9fcf84d5faee
+_md5_=15cc4140233b893c24e3cd714c92f282
diff --git a/metadata/md5-cache/dev-python/ccdproc-1.1.0 b/metadata/md5-cache/dev-python/ccdproc-1.1.0
index 5afa8f354fd4..c1a836ee7e10 100644
--- a/metadata/md5-cache/dev-python/ccdproc-1.1.0
+++ b/metadata/md5-cache/dev-python/ccdproc-1.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/astropy-helpers[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/ccdproc/ccdproc-1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36039f0ebb54774da70db628c6bc6329
+_md5_=53d78b774c58fbb4206a11270fc1428a
diff --git a/metadata/md5-cache/dev-python/ccdproc-1.2.0 b/metadata/md5-cache/dev-python/ccdproc-1.2.0
index 5c5cd4e8f54b..901c71bca45c 100644
--- a/metadata/md5-cache/dev-python/ccdproc-1.2.0
+++ b/metadata/md5-cache/dev-python/ccdproc-1.2.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/astropy-helpers[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/ccdproc/ccdproc-1.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4e0bbc3fa360a53a48a8856dcf31729
+_md5_=c4452412ad3fe712ebb782248ac6cb0e
diff --git a/metadata/md5-cache/dev-python/celery-4.1.0 b/metadata/md5-cache/dev-python/celery-4.1.0
index 00929bb359d0..61b4e6721d70 100644
--- a/metadata/md5-cache/dev-python/celery-4.1.0
+++ b/metadata/md5-cache/dev-python/celery-4.1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=<dev-python/kombu-4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/kombu-4.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/billiard-3.5.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/billiard-3.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/greenlet[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/vine[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/celery/celery-4.1.0.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=671c77e285ffee968b5cb0e7ae565075
+_md5_=1753fd9c8e4378aa1e9086d20d123285
diff --git a/metadata/md5-cache/dev-python/cement-2.0.2 b/metadata/md5-cache/dev-python/cement-2.0.2
index aaaf7c6a0749..c427d10ed0e1 100644
--- a/metadata/md5-cache/dev-python/cement-2.0.2
+++ b/metadata/md5-cache/dev-python/cement-2.0.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/datafolklabs/cement/archive/2.0.2.tar.gz -> cement-2.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4d26afba2610d9e54806ee313aa31ac
+_md5_=459f68327abffe9c4823909447928bb0
diff --git a/metadata/md5-cache/dev-python/chai-1.1.1 b/metadata/md5-cache/dev-python/chai-1.1.1
index 68e816e9a4f6..76e4ea36b3a2 100644
--- a/metadata/md5-cache/dev-python/chai-1.1.1
+++ b/metadata/md5-cache/dev-python/chai-1.1.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/chai/chai-1.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6bab06b42db5eb13a9a3eee85e6f13f4
+_md5_=6cca6cf3ab782b384ce378ed88494a03
diff --git a/metadata/md5-cache/dev-python/chameleon-2.25 b/metadata/md5-cache/dev-python/chameleon-2.25
index 75f2c8051e42..c8cd2702bf0c 100644
--- a/metadata/md5-cache/dev-python/chameleon-2.25
+++ b/metadata/md5-cache/dev-python/chameleon-2.25
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=repoze
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Chameleon/Chameleon-2.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0f92b889074a635fe3e89c65a407b02
+_md5_=1f6525d83980a2385288db5871a2754a
diff --git a/metadata/md5-cache/dev-python/cheroot-6.0.0 b/metadata/md5-cache/dev-python/cheroot-6.0.0
index b183b4de9d51..c4318b290afa 100644
--- a/metadata/md5-cache/dev-python/cheroot-6.0.0
+++ b/metadata/md5-cache/dev-python/cheroot-6.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.11.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/more-itertools-2.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-6.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3430d54062339ebde9faf84779b3463c
+_md5_=f184af6e207c1a6deb598c61557a72dc
diff --git a/metadata/md5-cache/dev-python/cheroot-6.0.0-r1 b/metadata/md5-cache/dev-python/cheroot-6.0.0-r1
index 11be4c130840..be07fbc4d98d 100644
--- a/metadata/md5-cache/dev-python/cheroot-6.0.0-r1
+++ b/metadata/md5-cache/dev-python/cheroot-6.0.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/more-itertools-2.6[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-6.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=84f8e4f1e45d88c11d872effb355a1ff
+_md5_=e0de868ec4f0ffce0a50d0abab02a86b
diff --git a/metadata/md5-cache/dev-python/cherrypy-13.1.0 b/metadata/md5-cache/dev-python/cherrypy-13.1.0
index 86ce0ce4a3bf..f24fc4f07f9f 100644
--- a/metadata/md5-cache/dev-python/cherrypy-13.1.0
+++ b/metadata/md5-cache/dev-python/cherrypy-13.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/cheroot-5.9.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/portend-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.11.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-13.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb7adf86e7dd8d85f177566469a46bd7
+_md5_=9b1fd1029582344cefc6101aaa03f0e7
diff --git a/metadata/md5-cache/dev-python/cherrypy-13.1.0-r1 b/metadata/md5-cache/dev-python/cherrypy-13.1.0-r1
index 92431c810035..72016dfec0be 100644
--- a/metadata/md5-cache/dev-python/cherrypy-13.1.0-r1
+++ b/metadata/md5-cache/dev-python/cherrypy-13.1.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/cheroot-5.9.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/portend-2.1.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-13.1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e006f07874bd83051c0afe5c43273540
+_md5_=89585676d51854a6a35fd09d1cb31aec
diff --git a/metadata/md5-cache/dev-python/click-5.1 b/metadata/md5-cache/dev-python/click-5.1
index 0883f54200c0..03308ae24d7f 100644
--- a/metadata/md5-cache/dev-python/click-5.1
+++ b/metadata/md5-cache/dev-python/click-5.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e12812b72d821a90e1ff27a706a478b
+_md5_=55319c76c96283fa47e0da009d323f8b
diff --git a/metadata/md5-cache/dev-python/click-6.6 b/metadata/md5-cache/dev-python/click-6.6
index 892e56f8abc6..433d13b2f01d 100644
--- a/metadata/md5-cache/dev-python/click-6.6
+++ b/metadata/md5-cache/dev-python/click-6.6
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-6.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4acdb15f249ba3ea9192d7f63d31fced
+_md5_=040981505c144e6af79cb4a3b4dee951
diff --git a/metadata/md5-cache/dev-python/click-6.7 b/metadata/md5-cache/dev-python/click-6.7
index f4a665ff8a76..5b0e94e395c0 100644
--- a/metadata/md5-cache/dev-python/click-6.7
+++ b/metadata/md5-cache/dev-python/click-6.7
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-6.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=865c7a1f644ebb1147bb7dc721471c47
+_md5_=a8448e461b45765fe157b7b1ec36af10
diff --git a/metadata/md5-cache/dev-python/click-6.7-r1 b/metadata/md5-cache/dev-python/click-6.7-r1
index f4976c5f9620..c5ee9015fbf6 100644
--- a/metadata/md5-cache/dev-python/click-6.7-r1
+++ b/metadata/md5-cache/dev-python/click-6.7-r1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-6.7.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ce1ed2d199f57bcf43dd0d548467a1d1
+_md5_=fcb45ccf141200e5919359f0cb590a46
diff --git a/metadata/md5-cache/dev-python/click-7.0 b/metadata/md5-cache/dev-python/click-7.0
index e7b6900ffebf..be7046aad54a 100644
--- a/metadata/md5-cache/dev-python/click-7.0
+++ b/metadata/md5-cache/dev-python/click-7.0
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/click/archive/7.0.tar.gz -> click-7.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a5157c0326cdad08da91cb3d7de6e27a
+_md5_=71ca1bf8b24c446164db2fd760e49bda
diff --git a/metadata/md5-cache/dev-python/click-log-0.1.8 b/metadata/md5-cache/dev-python/click-log-0.1.8
index 2c3a56a4ee73..41f5dbfacb8a 100644
--- a/metadata/md5-cache/dev-python/click-log-0.1.8
+++ b/metadata/md5-cache/dev-python/click-log-0.1.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-log/click-log-0.1.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d21f892941812055d68340589d831207
+_md5_=d04c70b50f15ab9ce9a55502c24c1234
diff --git a/metadata/md5-cache/dev-python/click-log-0.2.1 b/metadata/md5-cache/dev-python/click-log-0.2.1
index da548f3656fc..c125e4e09162 100644
--- a/metadata/md5-cache/dev-python/click-log-0.2.1
+++ b/metadata/md5-cache/dev-python/click-log-0.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-log/click-log-0.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d21f892941812055d68340589d831207
+_md5_=d04c70b50f15ab9ce9a55502c24c1234
diff --git a/metadata/md5-cache/dev-python/click-log-0.3.2 b/metadata/md5-cache/dev-python/click-log-0.3.2
index 086f5752425e..96df3ea6b980 100644
--- a/metadata/md5-cache/dev-python/click-log-0.3.2
+++ b/metadata/md5-cache/dev-python/click-log-0.3.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-log/click-log-0.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6da4596abfcf68650dd03988b8d7156d
+_md5_=6a4cbecf2b3a2e1ebddcaa287a964056
diff --git a/metadata/md5-cache/dev-python/click-threading-0.3.0 b/metadata/md5-cache/dev-python/click-threading-0.3.0
index 100dcb558e88..f91a4bdd37ba 100644
--- a/metadata/md5-cache/dev-python/click-threading-0.3.0
+++ b/metadata/md5-cache/dev-python/click-threading-0.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/click-contrib/click-threading/archive/0.3.0.tar.gz -> click-threading-0.3.0-gh.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc0bf4d0ffe6b65fc1446a45e56baa7e
+_md5_=e8119aa46959e9897d19f72987ef68f9
diff --git a/metadata/md5-cache/dev-python/click-threading-0.4.4 b/metadata/md5-cache/dev-python/click-threading-0.4.4
index bef094eb0d4c..05d3af97f4dc 100644
--- a/metadata/md5-cache/dev-python/click-threading-0.4.4
+++ b/metadata/md5-cache/dev-python/click-threading-0.4.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/click-contrib/click-threading/archive/0.4.4.tar.gz -> click-threading-0.4.4-gh.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc0bf4d0ffe6b65fc1446a45e56baa7e
+_md5_=e8119aa46959e9897d19f72987ef68f9
diff --git a/metadata/md5-cache/dev-python/cliff-2.12.0 b/metadata/md5-cache/dev-python/cliff-2.12.0
index 94e48d6cd080..9b2a4a2b34d8 100644
--- a/metadata/md5-cache/dev-python/cliff-2.12.0
+++ b/metadata/md5-cache/dev-python/cliff-2.12.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 hppa ~mips s390 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/cmd2-0.6.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/unicodecsv-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-2.12.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85b40835945c1d450d6a47c0b01f7e99
+_md5_=93ea79ea868083e31ea9455ac8ef31a3
diff --git a/metadata/md5-cache/dev-python/cliff-2.12.0-r2 b/metadata/md5-cache/dev-python/cliff-2.12.0-r2
index e25ce069c08f..38be64a14272 100644
--- a/metadata/md5-cache/dev-python/cliff-2.12.0-r2
+++ b/metadata/md5-cache/dev-python/cliff-2.12.0-r2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/cmd2-0.6.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/unicodecsv-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-2.12.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a5270c9c882cd272e7bcf1938f55efd4
+_md5_=6c4dedbbfe2fe5c92cb8607e4db5bbf5
diff --git a/metadata/md5-cache/dev-python/clint-0.5.1 b/metadata/md5-cache/dev-python/clint-0.5.1
index 626e3c6a8c7f..bf42938edc46 100644
--- a/metadata/md5-cache/dev-python/clint-0.5.1
+++ b/metadata/md5-cache/dev-python/clint-0.5.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86
 LICENSE=ISC
 RDEPEND=dev-python/args[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kennethreitz/clint/archive/v0.5.1.tar.gz -> clint-0.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6769ac5bb07e8bf0688c63ce7deaefce
+_md5_=eb5ec7d93d1f87251c4ea4b14d7e989d
diff --git a/metadata/md5-cache/dev-python/clint-0.5.1-r1 b/metadata/md5-cache/dev-python/clint-0.5.1-r1
index 027975797e1a..cb327c123a54 100644
--- a/metadata/md5-cache/dev-python/clint-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/clint-0.5.1-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=dev-python/args[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kennethreitz/clint/archive/v0.5.1.tar.gz -> clint-0.5.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9808589aaf8f0aace15f01d95c4d4333
+_md5_=f3226dcf3b6d90e0ddbaac19651bdcc1
diff --git a/metadata/md5-cache/dev-python/colander-1.3.1 b/metadata/md5-cache/dev-python/colander-1.3.1
index 4ee9c717dcaf..a746188bd67e 100644
--- a/metadata/md5-cache/dev-python/colander-1.3.1
+++ b/metadata/md5-cache/dev-python/colander-1.3.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=repoze MIT
 RDEPEND=>=dev-python/translationstring-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/colander/colander-1.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a63e95e9e5686a0c7d8f4c4113a98236
+_md5_=bd0950292fac17f27a4cad21bf148f55
diff --git a/metadata/md5-cache/dev-python/colorama-0.3.9-r1 b/metadata/md5-cache/dev-python/colorama-0.3.9-r1
index 87b0f46775a9..71b379a339bb 100644
--- a/metadata/md5-cache/dev-python/colorama-0.3.9-r1
+++ b/metadata/md5-cache/dev-python/colorama-0.3.9-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tartley/colorama/archive/0.3.9.tar.gz -> colorama-0.3.9.github.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=868db96ec218d4015abd9c5aa4447c4c
+_md5_=b8da5291d1dbbaab7509d8506ed4ef1d
diff --git a/metadata/md5-cache/dev-python/colorama-0.4.0 b/metadata/md5-cache/dev-python/colorama-0.4.0
index b9c69e45cea5..bb39c4196dd0 100644
--- a/metadata/md5-cache/dev-python/colorama-0.4.0
+++ b/metadata/md5-cache/dev-python/colorama-0.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tartley/colorama/archive/0.4.0.tar.gz -> colorama-0.4.0.github.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=868db96ec218d4015abd9c5aa4447c4c
+_md5_=b8da5291d1dbbaab7509d8506ed4ef1d
diff --git a/metadata/md5-cache/dev-python/colorama-0.4.1 b/metadata/md5-cache/dev-python/colorama-0.4.1
index 3575858fce7e..1e989bf75e3d 100644
--- a/metadata/md5-cache/dev-python/colorama-0.4.1
+++ b/metadata/md5-cache/dev-python/colorama-0.4.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tartley/colorama/archive/0.4.1.tar.gz -> colorama-0.4.1.github.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b1acbd24735849ca2ebc73a68f4b1482
+_md5_=1754c97f35c13a1befddc8fdd6b1cd85
diff --git a/metadata/md5-cache/dev-python/coloredlogs-6.1 b/metadata/md5-cache/dev-python/coloredlogs-6.1
index a0e6d2ef14c7..7c65a766c721 100644
--- a/metadata/md5-cache/dev-python/coloredlogs-6.1
+++ b/metadata/md5-cache/dev-python/coloredlogs-6.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/humanfriendly-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0dd9a802d961b8fcb92980e02cf2c5d6
+_md5_=cf413b76934bf2c0fd8e1a84f4d30dbb
diff --git a/metadata/md5-cache/dev-python/colorlog-3.1.4 b/metadata/md5-cache/dev-python/colorlog-3.1.4
index 0c2061d42972..071aff75fe8a 100644
--- a/metadata/md5-cache/dev-python/colorlog-3.1.4
+++ b/metadata/md5-cache/dev-python/colorlog-3.1.4
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorlog/colorlog-3.1.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1c3d5ee6397078cc4e6ff7c25d2f4e65
+_md5_=c8b2fa7c0be9fb2569ef2007560ad61f
diff --git a/metadata/md5-cache/dev-python/colorspacious-1.1.0 b/metadata/md5-cache/dev-python/colorspacious-1.1.0
index f542bb3c3797..889bbe04d2ac 100644
--- a/metadata/md5-cache/dev-python/colorspacious-1.1.0
+++ b/metadata/md5-cache/dev-python/colorspacious-1.1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorspacious/colorspacious-1.1.0.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a934e43f8fd98e4536c5301e863cd75
+_md5_=705a146bd8f3fd4c8e8616ad7d2dc258
diff --git a/metadata/md5-cache/dev-python/columnize-0.3.5-r1 b/metadata/md5-cache/dev-python/columnize-0.3.5-r1
index 6302319e02e4..a06c0ae7a5f0 100644
--- a/metadata/md5-cache/dev-python/columnize-0.3.5-r1
+++ b/metadata/md5-cache/dev-python/columnize-0.3.5-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=PSF-2
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/columnize/columnize-0.3.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f56daa2bdc054c272314c4f41ba223a8
+_md5_=f41f6e36d482f1ac222d66fb5cf50a7f
diff --git a/metadata/md5-cache/dev-python/commonmark-0.7.5 b/metadata/md5-cache/dev-python/commonmark-0.7.5
index 74ae76b4f85f..3ff23669e538 100644
--- a/metadata/md5-cache/dev-python/commonmark-0.7.5
+++ b/metadata/md5-cache/dev-python/commonmark-0.7.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/CommonMark/CommonMark-0.7.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40b5297d30e6528a35ccaa5cf4c33819
+_md5_=a44288590f8f3828b17330485f265e9c
diff --git a/metadata/md5-cache/dev-python/commonmark-0.8.1 b/metadata/md5-cache/dev-python/commonmark-0.8.1
index 3a37f0f397ab..7f421cced45f 100644
--- a/metadata/md5-cache/dev-python/commonmark-0.8.1
+++ b/metadata/md5-cache/dev-python/commonmark-0.8.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-l
 LICENSE=BSD
 RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/commonmark/commonmark-0.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=728a9b0a295339c2815e0d1119c8b52b
+_md5_=df601727add9fd901dc309de9ce44642
diff --git a/metadata/md5-cache/dev-python/constantly-15.1.0-r1 b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
index 7fcbd05b1a98..c9415b23680c 100644
--- a/metadata/md5-cache/dev-python/constantly-15.1.0-r1
+++ b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twisted/constantly/archive/15.1.0.tar.gz -> constantly-15.1.0.gh.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f212721dea8b203c960f67397938fa8
+_md5_=b0b382fca4b01f9182cbce987b569fd5
diff --git a/metadata/md5-cache/dev-python/construct-2.8.21 b/metadata/md5-cache/dev-python/construct-2.8.21
index e985af282a35..667563a6152b 100644
--- a/metadata/md5-cache/dev-python/construct-2.8.21
+++ b/metadata/md5-cache/dev-python/construct-2.8.21
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/construct/construct/archive/v2.8.21.tar.gz -> construct-2.8.21.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=013f7a615f32123b66734e76939f99bb
+_md5_=4af93a410a5a11bcdcb5b63451297dfd
diff --git a/metadata/md5-cache/dev-python/cookies-2.2.1 b/metadata/md5-cache/dev-python/cookies-2.2.1
index c1195f3317e2..86c610197d65 100644
--- a/metadata/md5-cache/dev-python/cookies-2.2.1
+++ b/metadata/md5-cache/dev-python/cookies-2.2.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cookies/cookies-2.2.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5810f263c3709df96723473028ccc0b6
+_md5_=ec07bbb8dd3667b6250c0abd48115092
diff --git a/metadata/md5-cache/dev-python/croniter-0.3.17 b/metadata/md5-cache/dev-python/croniter-0.3.17
index d8bdadced807..7efbcab8a3fd 100644
--- a/metadata/md5-cache/dev-python/croniter-0.3.17
+++ b/metadata/md5-cache/dev-python/croniter-0.3.17
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-0.3.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d087dc458e17e7d2417af418f395575
+_md5_=0ebeefe5136da7473408d1c572103a5f
diff --git a/metadata/md5-cache/dev-python/croniter-0.3.29 b/metadata/md5-cache/dev-python/croniter-0.3.29
index 7734b15960db..450dce3cff86 100644
--- a/metadata/md5-cache/dev-python/croniter-0.3.29
+++ b/metadata/md5-cache/dev-python/croniter-0.3.29
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-0.3.29.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=51fb8c4208769a8ce7f97bb77279238e
+_md5_=8702aae5cb4dc79b797d6f961b1463d4
diff --git a/metadata/md5-cache/dev-python/croniter-0.3.30 b/metadata/md5-cache/dev-python/croniter-0.3.30
index 94541cec8c05..e74f5ed18179 100644
--- a/metadata/md5-cache/dev-python/croniter-0.3.30
+++ b/metadata/md5-cache/dev-python/croniter-0.3.30
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-0.3.30.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3f7a2fb0a4f2de61f7df91304d4d9460
+_md5_=b72ac869b5edf10aab456a8c14834b11
diff --git a/metadata/md5-cache/dev-python/crumbs-2.1.0 b/metadata/md5-cache/dev-python/crumbs-2.1.0
index 3fc5d218c12c..670d9f281d8e 100644
--- a/metadata/md5-cache/dev-python/crumbs-2.1.0
+++ b/metadata/md5-cache/dev-python/crumbs-2.1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/crumbs/crumbs-2.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8e7db62d85faff95e74a9b438c9b0ad
+_md5_=ce95b70b5ee372f56aa34d16842d94c2
diff --git a/metadata/md5-cache/dev-python/curtsies-0.2.11 b/metadata/md5-cache/dev-python/curtsies-0.2.11
index 0e8a1d3bca1d..635abdab3e4f 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.2.11
+++ b/metadata/md5-cache/dev-python/curtsies-0.2.11
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/blessings-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyte[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wcwidth-0.1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/curtsies/curtsies-0.2.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ea98638a463a7ac695aafaf15228649
+_md5_=c327506daa61abfcbc1ff27fd213e08f
diff --git a/metadata/md5-cache/dev-python/curtsies-0.3.0 b/metadata/md5-cache/dev-python/curtsies-0.3.0
index 52a2548cd5b4..5d0464dc2973 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.3.0
+++ b/metadata/md5-cache/dev-python/curtsies-0.3.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/blessings-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyte[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wcwidth-0.1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/curtsies/curtsies-0.3.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=15172b97fca9f346f9bf5e488ac6ad48
+_md5_=3ccfb13d4db1f5c1211ba098e3d6a598
diff --git a/metadata/md5-cache/dev-python/curtsies-0.3.0-r1 b/metadata/md5-cache/dev-python/curtsies-0.3.0-r1
index d543e7ecd017..5ed85191ff00 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/curtsies-0.3.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/blessings-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wcwidth-0.1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/curtsies/curtsies-0.3.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0d8881e2d756398b019b6378045ff5f2
+_md5_=5c4bdf566797fec0249c639292d6c02a
diff --git a/metadata/md5-cache/dev-python/cython-0.29.4 b/metadata/md5-cache/dev-python/cython-0.29.4
index d55989460294..0f65600e6003 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.4
+++ b/metadata/md5-cache/dev-python/cython-0.29.4
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cython/Cython-0.29.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dbd8bf3c471d1c31119bc517eb6d2528
+_md5_=43e80e4402ab4a9b4b03e6398a4fbdad
diff --git a/metadata/md5-cache/dev-python/cytoolz-0.10.0 b/metadata/md5-cache/dev-python/cytoolz-0.10.0
index 2af7d6313e88..44ba3efe9780 100644
--- a/metadata/md5-cache/dev-python/cytoolz-0.10.0
+++ b/metadata/md5-cache/dev-python/cytoolz-0.10.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cytoolz/cytoolz-0.10.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b3af9dfb9f53b8330e9b1d47b5f20cde
+_md5_=c5a68377803c1740d31ccb8ddab225b0
diff --git a/metadata/md5-cache/dev-python/cytoolz-0.8.0 b/metadata/md5-cache/dev-python/cytoolz-0.8.0
index cfe76f269e56..730396792265 100644
--- a/metadata/md5-cache/dev-python/cytoolz-0.8.0
+++ b/metadata/md5-cache/dev-python/cytoolz-0.8.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cytoolz/cytoolz-0.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9be223513395f0f3daa1acff370fba2
+_md5_=6e8438ad89da792db387b6f8dd51d0c3
diff --git a/metadata/md5-cache/dev-python/cytoolz-0.8.2 b/metadata/md5-cache/dev-python/cytoolz-0.8.2
index f27cd1db4804..bdfe821455f5 100644
--- a/metadata/md5-cache/dev-python/cytoolz-0.8.2
+++ b/metadata/md5-cache/dev-python/cytoolz-0.8.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cytoolz/cytoolz-0.8.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4ce63073226f59437427df1cd301775a
+_md5_=5d2c9028b0baf9408e78cd25b3fd7b20
diff --git a/metadata/md5-cache/dev-python/dask-0.15.1 b/metadata/md5-cache/dev-python/dask-0.15.1
index 96a086e83520..955c39e6520c 100644
--- a/metadata/md5-cache/dev-python/dask-0.15.1
+++ b/metadata/md5-cache/dev-python/dask-0.15.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/cloudpickle-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.19[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/partd-0.3.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/toolz-0.7.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] distributed? ( >=dev-python/distributed-1.16[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/s3fs-0.0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-0.15.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a6465116c21843916b34661130949119
+_md5_=af4f4082186d0d2db2495eaf2cf13cee
diff --git a/metadata/md5-cache/dev-python/dask-1.2.0 b/metadata/md5-cache/dev-python/dask-1.2.0
index f622963f52a3..e811436409f1 100644
--- a/metadata/md5-cache/dev-python/dask-1.2.0
+++ b/metadata/md5-cache/dev-python/dask-1.2.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/cloudpickle-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pandas-0.23.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/partd-0.3.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/toolz-0.7.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] distributed? ( >=dev-python/distributed-1.16[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/s3fs-0.0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-1.2.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fd4f498876000e6a4d5aad7697a2a1a2
+_md5_=ce1a19452ab1727db67cc44d80e3dec7
diff --git a/metadata/md5-cache/dev-python/datashape-0.5.4 b/metadata/md5-cache/dev-python/datashape-0.5.4
index 6c42b7c97436..8a3bc0b146cd 100644
--- a/metadata/md5-cache/dev-python/datashape-0.5.4
+++ b/metadata/md5-cache/dev-python/datashape-0.5.4
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multipledispatch-0.4.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blaze/datashape/archive/0.5.4.tar.gz -> datashape-0.5.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c20c932d168ee381edc7272a7da3708a
+_md5_=691cd4dc518736e5012e38b63f38985b
diff --git a/metadata/md5-cache/dev-python/dbus-python-1.2.4 b/metadata/md5-cache/dev-python/dbus-python-1.2.4
index 81e0a1cf9193..57439cedcf1f 100644
--- a/metadata/md5-cache/dev-python/dbus-python-1.2.4
+++ b/metadata/md5-cache/dev-python/dbus-python-1.2.4
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~am
 LICENSE=MIT
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=sys-apps/dbus-1.6:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) doc? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1a3ebdf2b532ece14f1614f0bc3f697
+_md5_=301a694bc6ae542356e8de44d4833a9a
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.18.2 b/metadata/md5-cache/dev-python/dbusmock-0.18.2
index 5ff298f39812..ca013ce6c8ed 100644
--- a/metadata/md5-cache/dev-python/dbusmock-0.18.2
+++ b/metadata/md5-cache/dev-python/dbusmock-0.18.2
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/python-dbusmock/releases/download/0.18.2/python-dbusmock-0.18.2.tar.gz -> dbusmock-0.18.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=eefe4f15d5e38e2f6f663bfc4ee86ce3
+_md5_=af47d40cbd6ec30c48b9776cfb60a410
diff --git a/metadata/md5-cache/dev-python/ddt-1.1.1 b/metadata/md5-cache/dev-python/ddt-1.1.1
index 67e5bca393ca..d1d970b454f3 100644
--- a/metadata/md5-cache/dev-python/ddt-1.1.1
+++ b/metadata/md5-cache/dev-python/ddt-1.1.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/ddt/ddt-1.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cce0aef52cd1a5c81a3a723d5982e5c5
+_md5_=2c2cf57af6b2fdea34a6985f3bca1dd7
diff --git a/metadata/md5-cache/dev-python/debtcollector-1.21.0 b/metadata/md5-cache/dev-python/debtcollector-1.21.0
index 2ec95c7517d2..24cfa6fe09e1 100644
--- a/metadata/md5-cache/dev-python/debtcollector-1.21.0
+++ b/metadata/md5-cache/dev-python/debtcollector-1.21.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wrapt-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/debtcollector/debtcollector-1.21.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=61dede2b2f1277fa7562b817ea233ab5
+_md5_=25cdab917a0ce01a12912b425a3ff05a
diff --git a/metadata/md5-cache/dev-python/denonavr-0.7.10 b/metadata/md5-cache/dev-python/denonavr-0.7.10
index db1e1bc6df9d..7cd046acbd02 100644
--- a/metadata/md5-cache/dev-python/denonavr-0.7.10
+++ b/metadata/md5-cache/dev-python/denonavr-0.7.10
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/denonavr/denonavr-0.7.10.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=321d19353649f85b3993e5f458491934
+_md5_=92654c8c2a77c510e07e37d853be570b
diff --git a/metadata/md5-cache/dev-python/denonavr-0.7.9 b/metadata/md5-cache/dev-python/denonavr-0.7.9
index 86470d7aa664..acc67bc98c09 100644
--- a/metadata/md5-cache/dev-python/denonavr-0.7.9
+++ b/metadata/md5-cache/dev-python/denonavr-0.7.9
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/denonavr/denonavr-0.7.9.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=321d19353649f85b3993e5f458491934
+_md5_=92654c8c2a77c510e07e37d853be570b
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.6 b/metadata/md5-cache/dev-python/deprecated-1.2.6
index 220323834d83..780bd2d840fb 100644
--- a/metadata/md5-cache/dev-python/deprecated-1.2.6
+++ b/metadata/md5-cache/dev-python/deprecated-1.2.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/wrapt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tantale/deprecated/archive/v1.2.6.tar.gz -> deprecated-1.2.6.gh.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b1f8af9080a4478131f84fde47098307
+_md5_=7021e2d0763274d96e05e192aafd1bb2
diff --git a/metadata/md5-cache/dev-python/deprecation-2.0.6 b/metadata/md5-cache/dev-python/deprecation-2.0.6
index 3126a3e0cd25..3787534f5036 100644
--- a/metadata/md5-cache/dev-python/deprecation-2.0.6
+++ b/metadata/md5-cache/dev-python/deprecation-2.0.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/packaging[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/deprecation/deprecation-2.0.6.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5cd3c6283600885589c022182bfcc689
+_md5_=ebf819a53648c0e52797190852995485
diff --git a/metadata/md5-cache/dev-python/deprecation-2.0.7 b/metadata/md5-cache/dev-python/deprecation-2.0.7
index 5c0cf0f8401c..521534e8d765 100644
--- a/metadata/md5-cache/dev-python/deprecation-2.0.7
+++ b/metadata/md5-cache/dev-python/deprecation-2.0.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/packaging[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/deprecation/deprecation-2.0.7.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b1013b5923ed9c516fcb0f86a95cad76
+_md5_=81e6338f0535c1bab2efb06e66f3ce76
diff --git a/metadata/md5-cache/dev-python/dexml-0.5.1 b/metadata/md5-cache/dev-python/dexml-0.5.1
index 32e3d2f46a3c..aa28d42bd2af 100644
--- a/metadata/md5-cache/dev-python/dexml-0.5.1
+++ b/metadata/md5-cache/dev-python/dexml-0.5.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dexml/dexml-0.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36a0c5714c5cbb472880834922c4c3df
+_md5_=f8b4f7b045cd1a5ce08abbcdf477736b
diff --git a/metadata/md5-cache/dev-python/diskcache-2.8.3 b/metadata/md5-cache/dev-python/diskcache-2.8.3
index 07bae89588cd..7b549ab9eca3 100644
--- a/metadata/md5-cache/dev-python/diskcache-2.8.3
+++ b/metadata/md5-cache/dev-python/diskcache-2.8.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/django[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskcache/diskcache-2.8.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca0e085af3b3006ccb3baa49123e6eae
+_md5_=a090bfac5770f222275759063b733d99
diff --git a/metadata/md5-cache/dev-python/diskcache-3.1.0 b/metadata/md5-cache/dev-python/diskcache-3.1.0
index 2217dbe2143e..0d2740080906 100644
--- a/metadata/md5-cache/dev-python/diskcache-3.1.0
+++ b/metadata/md5-cache/dev-python/diskcache-3.1.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/django[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskcache/diskcache-3.1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1d4d9fad361b5d48b68d67c5be974b89
+_md5_=920a2199c60f30a40e7841527efd34f7
diff --git a/metadata/md5-cache/dev-python/disqus-python-0.4.2 b/metadata/md5-cache/dev-python/disqus-python-0.4.2
index e01896c38b97..75246a8602a9 100644
--- a/metadata/md5-cache/dev-python/disqus-python-0.4.2
+++ b/metadata/md5-cache/dev-python/disqus-python-0.4.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/disqus-python/disqus-python-0.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3e1adbad5e957042ebed8c9131ff875
+_md5_=079c72b0d969c0342da3f34d66ae7433
diff --git a/metadata/md5-cache/dev-python/distributed-1.18.0 b/metadata/md5-cache/dev-python/distributed-1.18.0
index d958551661e1..a23cb0eb883c 100644
--- a/metadata/md5-cache/dev-python/distributed-1.18.0
+++ b/metadata/md5-cache/dev-python/distributed-1.18.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cloudpickle-0.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dask-0.14.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/joblib-0.10.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/partd-0.3.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sortedcollections[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/tblib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/toolz-0.7.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zict[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/distributed/distributed-1.18.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b43e915d0aaa0137a48b72b09542dad
+_md5_=45ce2ec9c7a63b2e54a548e8cfb481fe
diff --git a/metadata/md5-cache/dev-python/distributed-1.18.0-r1 b/metadata/md5-cache/dev-python/distributed-1.18.0-r1
index e9cc7523e06c..70e835c1c88c 100644
--- a/metadata/md5-cache/dev-python/distributed-1.18.0-r1
+++ b/metadata/md5-cache/dev-python/distributed-1.18.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cloudpickle-0.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dask-0.14.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/joblib-0.10.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/msgpack[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/partd-0.3.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sortedcollections[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/tblib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/toolz-0.7.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zict[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/distributed/distributed-1.18.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=84dc10e46e14d07b31c902e2912251c5
+_md5_=4d655317670a9662ff7c1b3cf2c8c3b5
diff --git a/metadata/md5-cache/dev-python/django-1.11.20 b/metadata/md5-cache/dev-python/django-1.11.20
index 8bbfbb586444..ba64d2f14d6d 100644
--- a/metadata/md5-cache/dev-python/django-1.11.20
+++ b/metadata/md5-cache/dev-python/django-1.11.20
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~
 LICENSE=BSD Apache-2.0 MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.11/Django-1.11.20.tar.gz mirror://pypi/D/Django/Django-1.11.20.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=72deae2833e7f11bd96c76d315a432d1
+_md5_=1c50cbc535b5d22e829e2d50b6aad793
diff --git a/metadata/md5-cache/dev-python/django-1.11.21 b/metadata/md5-cache/dev-python/django-1.11.21
index 339209189983..45bc9468ef81 100644
--- a/metadata/md5-cache/dev-python/django-1.11.21
+++ b/metadata/md5-cache/dev-python/django-1.11.21
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD Apache-2.0 MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.11/Django-1.11.21.tar.gz mirror://pypi/D/Django/Django-1.11.21.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbbcbb40e508672956c90fcccbd29342
+_md5_=14f3e7ec107681c12faf153d421d09c0
diff --git a/metadata/md5-cache/dev-python/django-2.1.8 b/metadata/md5-cache/dev-python/django-2.1.8
index 4e4fef3d871a..f9bbfc0c3bc5 100644
--- a/metadata/md5-cache/dev-python/django-2.1.8
+++ b/metadata/md5-cache/dev-python/django-2.1.8
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~
 LICENSE=BSD Apache-2.0 MIT
 RDEPEND=dev-python/pytz[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.1/Django-2.1.8.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=646ef6c262a6b1244275ed92f1ab3246
+_md5_=77df2da8e02ae7f1376b305fde46cf71
diff --git a/metadata/md5-cache/dev-python/django-2.1.9 b/metadata/md5-cache/dev-python/django-2.1.9
index 4509fdcd87e3..6153ba2a0ba1 100644
--- a/metadata/md5-cache/dev-python/django-2.1.9
+++ b/metadata/md5-cache/dev-python/django-2.1.9
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD Apache-2.0 MIT
 RDEPEND=dev-python/pytz[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.1/Django-2.1.9.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3bebe6a38f0721c9a5ccf3c5239e4a09
+_md5_=e20a56779ac4519d1c5b68df0ee43a19
diff --git a/metadata/md5-cache/dev-python/django-2.2.1 b/metadata/md5-cache/dev-python/django-2.2.1
index eaedca3312f6..6de8174a5c0c 100644
--- a/metadata/md5-cache/dev-python/django-2.2.1
+++ b/metadata/md5-cache/dev-python/django-2.2.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~
 LICENSE=BSD Apache-2.0 MIT
 RDEPEND=dev-python/pytz[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-sqlparse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.2/Django-2.2.1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=edea3fca6b4c99613a38fe55d1164111
+_md5_=569e85b7d0fbbe88bc18931b9f9aa4c5
diff --git a/metadata/md5-cache/dev-python/django-2.2.2 b/metadata/md5-cache/dev-python/django-2.2.2
index 6a6474ad10dc..801df11b9a20 100644
--- a/metadata/md5-cache/dev-python/django-2.2.2
+++ b/metadata/md5-cache/dev-python/django-2.2.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD Apache-2.0 MIT
 RDEPEND=dev-python/pytz[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-sqlparse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.2/Django-2.2.2.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=37f3141dcbe3c4c3ab1304e518bb5be4
+_md5_=e8a464037ea463b054a6c6c03ac848a8
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-1.2.2 b/metadata/md5-cache/dev-python/django-auth-ldap-1.2.2
index d8783594609e..27a7101e9f9f 100644
--- a/metadata/md5-cache/dev-python/django-auth-ldap-1.2.2
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-1.2.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/django[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/python-ldap-2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-1.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a62d5bd38c9f8cf6d59b810bdeb8a39
+_md5_=de4584a3c138428ae1b463c4f71bd879
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-1.2.7 b/metadata/md5-cache/dev-python/django-auth-ldap-1.2.7
index 2d39c0203d2b..429dc8d879e0 100644
--- a/metadata/md5-cache/dev-python/django-auth-ldap-1.2.7
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-1.2.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/django[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/python-ldap-2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-1.2.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7bc1804f3c5175b3072d2cd5867a6538
+_md5_=f070742f11428066e72f11ca340a2fd5
diff --git a/metadata/md5-cache/dev-python/django-endless-pagination-2.0 b/metadata/md5-cache/dev-python/django-endless-pagination-2.0
index 98c637257ffb..31b55fec382e 100644
--- a/metadata/md5-cache/dev-python/django-endless-pagination-2.0
+++ b/metadata/md5-cache/dev-python/django-endless-pagination-2.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/django-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/frankban/django-endless-pagination/archive/v2.0.tar.gz -> django-endless-pagination-2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1fa5d789e9ceca1067ab759efddfcc4
+_md5_=edb11476d300f87c3de3adda4f8c84dd
diff --git a/metadata/md5-cache/dev-python/django-ldapdb-0.3.2 b/metadata/md5-cache/dev-python/django-ldapdb-0.3.2
index ea447bf24c18..73f80ca132ec 100644
--- a/metadata/md5-cache/dev-python/django-ldapdb-0.3.2
+++ b/metadata/md5-cache/dev-python/django-ldapdb-0.3.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-ldap-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-ldapdb/django-ldapdb-0.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f8441fe4102fa674797113886481a25
+_md5_=38d4a25624b38e26b94713ad5c6ec168
diff --git a/metadata/md5-cache/dev-python/django-ldapdb-0.4.0 b/metadata/md5-cache/dev-python/django-ldapdb-0.4.0
index 39faec381a5b..3dc9760a1f6b 100644
--- a/metadata/md5-cache/dev-python/django-ldapdb-0.4.0
+++ b/metadata/md5-cache/dev-python/django-ldapdb-0.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-ldap-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-ldapdb/django-ldapdb-0.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b45aced687fa3aefb3e0a4a4e7a6c839
+_md5_=3890c50930673c6f43a7359629b71a75
diff --git a/metadata/md5-cache/dev-python/django-oauth-plus-2.2.8 b/metadata/md5-cache/dev-python/django-oauth-plus-2.2.8
index 3372946afcd8..cc816070f44e 100644
--- a/metadata/md5-cache/dev-python/django-oauth-plus-2.2.8
+++ b/metadata/md5-cache/dev-python/django-oauth-plus-2.2.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/django-1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/oauth2-1.5.170[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-oauth-plus/django-oauth-plus-2.2.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c67c1f3e75bd199723c672c20b6d01e
+_md5_=c4112e6a78e0c1092bdffdccaa48c0a7
diff --git a/metadata/md5-cache/dev-python/django-recaptcha-1.0.5 b/metadata/md5-cache/dev-python/django-recaptcha-1.0.5
index 603884ee4a07..bc2a7a89dcdf 100644
--- a/metadata/md5-cache/dev-python/django-recaptcha-1.0.5
+++ b/metadata/md5-cache/dev-python/django-recaptcha-1.0.5
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/django[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/praekelt/django-recaptcha/archive/1.0.5.tar.gz -> django-recaptcha-1.0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ad8f627a375a3a952b0d3501a7cfd21
+_md5_=bf98281f42b71a6523b78b1ec0549f1c
diff --git a/metadata/md5-cache/dev-python/django-xslt-0.4.5-r1 b/metadata/md5-cache/dev-python/django-xslt-0.4.5-r1
index 1326e25af290..8c719dec8195 100644
--- a/metadata/md5-cache/dev-python/django-xslt-0.4.5-r1
+++ b/metadata/md5-cache/dev-python/django-xslt-0.4.5-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-xslt/django-xslt-0.4.5.tar.gz test? ( https://dev.gentoo.org/~tampakrap/tarballs/django-xslt-demoapp-0.4.5_p20120427.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2affea4921c34c2c4f57cc52b76a7d36
+_md5_=c9334976550912766024a75e982f7e6e
diff --git a/metadata/md5-cache/dev-python/dnspython-1.15.0-r1 b/metadata/md5-cache/dev-python/dnspython-1.15.0-r1
index 90aa3485dc9e..c2049ce643ad 100644
--- a/metadata/md5-cache/dev-python/dnspython-1.15.0-r1
+++ b/metadata/md5-cache/dev-python/dnspython-1.15.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-l
 LICENSE=ISC
 RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !dev-python/dnspython:py2 !dev-python/dnspython:py3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dnspython/dnspython-1.15.0.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=98f11fd85d0c0b4b24882bf45d1e8d72
+_md5_=309836a9cc8c226e0bfd23f3718e434c
diff --git a/metadata/md5-cache/dev-python/docker-py-2.7.0 b/metadata/md5-cache/dev-python/docker-py-2.7.0
index 5664b52e9c13..e932b79f4848 100644
--- a/metadata/md5-cache/dev-python/docker-py-2.7.0
+++ b/metadata/md5-cache/dev-python/docker-py-2.7.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/docker-pycreds-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/2.7.0.tar.gz -> docker-py-2.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bcdaf356b951c10693e59dc24b486b19
+_md5_=48369acbbee6e841791e5be6245861d7
diff --git a/metadata/md5-cache/dev-python/docker-py-3.6.0 b/metadata/md5-cache/dev-python/docker-py-3.6.0
index d85daf5a1313..0a14265d00d5 100644
--- a/metadata/md5-cache/dev-python/docker-py-3.6.0
+++ b/metadata/md5-cache/dev-python/docker-py-3.6.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/docker-pycreds-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/3.6.0.tar.gz -> docker-py-3.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d727da61dec47f21be46104737d77639
+_md5_=5c2cb0fb976938b9583487b08871b082
diff --git a/metadata/md5-cache/dev-python/docker-py-3.7.1 b/metadata/md5-cache/dev-python/docker-py-3.7.1
index 7d85c556f14f..a46ae5db13f6 100644
--- a/metadata/md5-cache/dev-python/docker-py-3.7.1
+++ b/metadata/md5-cache/dev-python/docker-py-3.7.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/docker-pycreds-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/3.7.1.tar.gz -> docker-py-3.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c5eceaac5c2edd6b10e99c39650e0c80
+_md5_=30dcb61670deabb1233ed7692c53b6a4
diff --git a/metadata/md5-cache/dev-python/docker-py-3.7.3 b/metadata/md5-cache/dev-python/docker-py-3.7.3
index 801de92e8af0..593764c58006 100644
--- a/metadata/md5-cache/dev-python/docker-py-3.7.3
+++ b/metadata/md5-cache/dev-python/docker-py-3.7.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/docker-pycreds-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/3.7.3.tar.gz -> docker-py-3.7.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=195a35ad5efb73d4957a22e890ac4fab
+_md5_=f9e12c3faf6288f0b463da1debeaca23
diff --git a/metadata/md5-cache/dev-python/dockerpty-0.4.1 b/metadata/md5-cache/dev-python/dockerpty-0.4.1
index 239cb62757b0..0a97343eb6e2 100644
--- a/metadata/md5-cache/dev-python/dockerpty-0.4.1
+++ b/metadata/md5-cache/dev-python/dockerpty-0.4.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/d11wtq/dockerpty/archive/v0.4.1.tar.gz -> dockerpty-0.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1e23f2b4189f45dd10c1dd7f096fa89
+_md5_=8717465a9aefd812638e4d42fc2d055d
diff --git a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2 b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
index c04aa3d357c5..48b5958b78a2 100644
--- a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
+++ b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=633b96467071b2e9835301dca471d80a
+_md5_=3670e1f4f533b00d09e5b2399e255275
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-0.6.4 b/metadata/md5-cache/dev-python/dogpile-cache-0.6.4
index 86bc57d69655..829724c3aaf8 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-0.6.4
+++ b/metadata/md5-cache/dev-python/dogpile-cache-0.6.4
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-0.6.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61d05a0468786a3cd0fc8ab905e1758b
+_md5_=5bb88b6da8a9e3f6a1737f83ac009e26
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-0.7.1 b/metadata/md5-cache/dev-python/dogpile-cache-0.7.1
index c927089c14bb..ebcbaaa8d141 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-0.7.1
+++ b/metadata/md5-cache/dev-python/dogpile-cache-0.7.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-0.7.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5d8006807f8fe14b57801afc27dc9c29
+_md5_=64f80c8dbdc7d5aa333e02aae0e7b4cd
diff --git a/metadata/md5-cache/dev-python/dogpile-core-0.4.1 b/metadata/md5-cache/dev-python/dogpile-core-0.4.1
index 0df1f0da8a08..b20c64133942 100644
--- a/metadata/md5-cache/dev-python/dogpile-core-0.4.1
+++ b/metadata/md5-cache/dev-python/dogpile-core-0.4.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.core/dogpile.core-0.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0881c98e77bd0a2da1b7704fac77dc6d
+_md5_=9710eeeb940cadc367376a9a41f0fd07
diff --git a/metadata/md5-cache/dev-python/doit-py-0.4.0 b/metadata/md5-cache/dev-python/doit-py-0.4.0
index d7d5a1e1503d..608c2a9ea122 100644
--- a/metadata/md5-cache/dev-python/doit-py-0.4.0
+++ b/metadata/md5-cache/dev-python/doit-py-0.4.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=virtual/python-pathlib[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/doit[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configclass[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/doit-py/doit-py-0.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1cc2722454c9dff9d19fb78e300506e
+_md5_=857670b648454b111c744be85d4c6c8f
diff --git a/metadata/md5-cache/dev-python/dominate-2.3.1 b/metadata/md5-cache/dev-python/dominate-2.3.1
index 513f5e54a64a..3f70b38bc87f 100644
--- a/metadata/md5-cache/dev-python/dominate-2.3.1
+++ b/metadata/md5-cache/dev-python/dominate-2.3.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dominate/dominate-2.3.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d256b766a65c2961d434f144b5005b65
+_md5_=c3ae7f8b6e9dbfca5e74ddfd482d8375
diff --git a/metadata/md5-cache/dev-python/dominate-2.3.5 b/metadata/md5-cache/dev-python/dominate-2.3.5
index 1c0e37ef6e4c..1a9692092f6e 100644
--- a/metadata/md5-cache/dev-python/dominate-2.3.5
+++ b/metadata/md5-cache/dev-python/dominate-2.3.5
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dominate/dominate-2.3.5.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fa0929257f68754d1032a199fee6afea
+_md5_=c9411a0130f9a013c167d134996fab6e
diff --git a/metadata/md5-cache/dev-python/dominate-2.4.0 b/metadata/md5-cache/dev-python/dominate-2.4.0
index 1909e1974eb7..9cf4f0c2ce54 100644
--- a/metadata/md5-cache/dev-python/dominate-2.4.0
+++ b/metadata/md5-cache/dev-python/dominate-2.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dominate/dominate-2.4.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=92ba073d0cd9a7ebbdd11c6c9434a27a
+_md5_=64e2dbfdaf0a3607e43914d4773963ed
diff --git a/metadata/md5-cache/dev-python/doublex-1.8.1 b/metadata/md5-cache/dev-python/doublex-1.8.1
index db422aa8900b..937f47b19624 100644
--- a/metadata/md5-cache/dev-python/doublex-1.8.1
+++ b/metadata/md5-cache/dev-python/doublex-1.8.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=dev-python/pyhamcrest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/DavidVilla/python-doublex/get/v1.8.1.tar.gz -> doublex-1.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f95204d79097c5d3c80c5ebf00fb9fa9
+_md5_=6734815351874d38fe69ad1e836868a6
diff --git a/metadata/md5-cache/dev-python/doublex-expects-0.7.0_rc2 b/metadata/md5-cache/dev-python/doublex-expects-0.7.0_rc2
index 881209f9ed41..c3c195bccb4c 100644
--- a/metadata/md5-cache/dev-python/doublex-expects-0.7.0_rc2
+++ b/metadata/md5-cache/dev-python/doublex-expects-0.7.0_rc2
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-python/doublex[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/expects-0.8.0_rc1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaimegildesagredo/doublex-expects/archive/v0.7.0rc2.tar.gz -> doublex-expects-0.7.0_rc2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f20a8a5fbdad7224c8d2ec81494616f
+_md5_=0e5211e48ccfad35c9a502681a2af757
diff --git a/metadata/md5-cache/dev-python/dugong-3.7.1 b/metadata/md5-cache/dev-python/dugong-3.7.1
index 8915ffece8f9..d6a7dfa93a4f 100644
--- a/metadata/md5-cache/dev-python/dugong-3.7.1
+++ b/metadata/md5-cache/dev-python/dugong-3.7.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dugong/dugong-3.7.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13e455c2b5312333b8fb98b011fb0af8
+_md5_=1b1c7ffa31ee2b12439865aed00185b1
diff --git a/metadata/md5-cache/dev-python/dugong-3.7.2 b/metadata/md5-cache/dev-python/dugong-3.7.2
index a7b5a28ce5e6..11dd1497915e 100644
--- a/metadata/md5-cache/dev-python/dugong-3.7.2
+++ b/metadata/md5-cache/dev-python/dugong-3.7.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dugong/dugong-3.7.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=73e35c84b58c84d62257eced2b6f0d04
+_md5_=5619079d3219f744aef06e2cf8bc3b14
diff --git a/metadata/md5-cache/dev-python/dugong-3.7.3 b/metadata/md5-cache/dev-python/dugong-3.7.3
index b226e7150914..a13c5da6ef15 100644
--- a/metadata/md5-cache/dev-python/dugong-3.7.3
+++ b/metadata/md5-cache/dev-python/dugong-3.7.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dugong/dugong-3.7.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40f84b70f2ee4bc2e473858f9012e096
+_md5_=91e9ac642684655aecc77528480fb126
diff --git a/metadata/md5-cache/dev-python/dulwich-0.18.5 b/metadata/md5-cache/dev-python/dulwich-0.18.5
index 1c108982cad4..69a619bc791e 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.18.5
+++ b/metadata/md5-cache/dev-python/dulwich-0.18.5
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac
 LICENSE=GPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.18.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8d928d69706745bf60bcbc6eff31203
+_md5_=be824aaa88afe73d3e2d7bae5bc696a4
diff --git a/metadata/md5-cache/dev-python/dulwich-0.18.6 b/metadata/md5-cache/dev-python/dulwich-0.18.6
index 1b86656deedd..64dda7d34129 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.18.6
+++ b/metadata/md5-cache/dev-python/dulwich-0.18.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac
 LICENSE=GPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.18.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de81815a1640f222ba3da8435c20d2f0
+_md5_=8c2b4a4bc5d591ba1e256a935df2ca2b
diff --git a/metadata/md5-cache/dev-python/dulwich-0.19.4 b/metadata/md5-cache/dev-python/dulwich-0.19.4
index ae094c6223e6..3192b39fb954 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.19.4
+++ b/metadata/md5-cache/dev-python/dulwich-0.19.4
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-
 LICENSE=GPL-2+
 RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/urllib3-1.21[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.19.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c34f4cc5f4b8cfbb6007a102c9892156
+_md5_=98e2c57e50286943e09fc36f43c801a1
diff --git a/metadata/md5-cache/dev-python/dulwich-0.19.6 b/metadata/md5-cache/dev-python/dulwich-0.19.6
index 8249b2a079bb..ae976bc9994f 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.19.6
+++ b/metadata/md5-cache/dev-python/dulwich-0.19.6
@@ -9,7 +9,8 @@ KEYWORDS=amd64 arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-ma
 LICENSE=GPL-2+
 RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urllib3-1.21[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.19.6.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6b8b4731c50318b7545ba9af33325f18
+_md5_=943fc2145352cf6264cc706a4ff76416
diff --git a/metadata/md5-cache/dev-python/dynd-python-0.7.2-r1 b/metadata/md5-cache/dev-python/dynd-python-0.7.2-r1
index 2605afd2724d..8836fbaec228 100644
--- a/metadata/md5-cache/dev-python/dynd-python-0.7.2-r1
+++ b/metadata/md5-cache/dev-python/dynd-python-0.7.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-libs/libdynd-0.7.2 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libdynd/dynd-python/archive/v0.7.2.tar.gz -> dynd-python-0.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=651b02a1ee91041053909001de435c1d
+_md5_=25f159dda1311b8894066a7466f61ad4
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.12 b/metadata/md5-cache/dev-python/ebuildtester-0.1.12
index b58265c0802a..34cd26af445d 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.12
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=app-emulation/docker python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.12.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62685bcecf98424dadcadf6e1a10ccba
+_md5_=2a5a0ae0cd2ecf01ce1653e2171f745a
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.13 b/metadata/md5-cache/dev-python/ebuildtester-0.1.13
index 58a0573140e5..4398d2187c7d 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.13
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.13
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=app-emulation/docker python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.13.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62685bcecf98424dadcadf6e1a10ccba
+_md5_=2a5a0ae0cd2ecf01ce1653e2171f745a
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.14 b/metadata/md5-cache/dev-python/ebuildtester-0.1.14
index 57bb89a48ce7..693ec91b6a75 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.14
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.14
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=app-emulation/docker python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.14.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62685bcecf98424dadcadf6e1a10ccba
+_md5_=2a5a0ae0cd2ecf01ce1653e2171f745a
diff --git a/metadata/md5-cache/dev-python/ed25519ll-0.6 b/metadata/md5-cache/dev-python/ed25519ll-0.6
index 3576bd6a20ba..2d9198ffa89b 100644
--- a/metadata/md5-cache/dev-python/ed25519ll-0.6
+++ b/metadata/md5-cache/dev-python/ed25519ll-0.6
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linu
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ed25519ll/ed25519ll-0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85c36f848ceb3807557bd245a177101a
+_md5_=58da957665a4d4a6bcfe37e5823b647e
diff --git a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0 b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
index 47febf39bdea..552a9aae6890 100644
--- a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
+++ b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=PYTHON BSD-4
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-py/archive/v0.12.0.tar.gz -> editorconfig-core-py-0.12.0.tar.gz test? ( https://github.com/editorconfig/editorconfig-core-test/archive/abb579e00f2deeede91cb485e53512efab9c6474.tar.gz -> editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e17d66477bc48d829a1195c19ef75ff
+_md5_=ff52a5c9939fb73713cd13b71de9bb35
diff --git a/metadata/md5-cache/dev-python/emcee-2.1.0 b/metadata/md5-cache/dev-python/emcee-2.1.0
index 757df748c6e3..736b17104bdb 100644
--- a/metadata/md5-cache/dev-python/emcee-2.1.0
+++ b/metadata/md5-cache/dev-python/emcee-2.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/emcee/emcee-2.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b200e20076bb78f30bb6719ccb227e7
+_md5_=d9f9e1f57b41ba9cf0e9a6294b81ccc4
diff --git a/metadata/md5-cache/dev-python/emcee-2.2.1 b/metadata/md5-cache/dev-python/emcee-2.2.1
index 1ecc998376ae..27a9b628095a 100644
--- a/metadata/md5-cache/dev-python/emcee-2.2.1
+++ b/metadata/md5-cache/dev-python/emcee-2.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/emcee/emcee-2.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=050b7da4a7249db277b9a05fc63a1a1a
+_md5_=467b51d1e900d736d9d27b465ac8fb9a
diff --git a/metadata/md5-cache/dev-python/entrypoints-0.2.3 b/metadata/md5-cache/dev-python/entrypoints-0.2.3
index 40200e7e0f98..4c989fae2e90 100644
--- a/metadata/md5-cache/dev-python/entrypoints-0.2.3
+++ b/metadata/md5-cache/dev-python/entrypoints-0.2.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com//takluyver/entrypoints/archive/0.2.3.tar.gz -> entrypoints-0.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33ce7e6dfbe005dc919e164b9539f90a
+_md5_=c2c15d02f92e67922f6dc87c0e379cb3
diff --git a/metadata/md5-cache/dev-python/enzyme-0.4.1-r2 b/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
index 16f13b74207e..cccda67bc59e 100644
--- a/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
+++ b/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/enzyme/enzyme-0.4.1.tar.gz test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1de7ddfdbb91d67b1daec07d142ef2fc
+_md5_=5b3075429d153bbf0838aa590fa4c071
diff --git a/metadata/md5-cache/dev-python/enzyme-9999 b/metadata/md5-cache/dev-python/enzyme-9999
index e3e032f4d545..c60579f5a377 100644
--- a/metadata/md5-cache/dev-python/enzyme-9999
+++ b/metadata/md5-cache/dev-python/enzyme-9999
@@ -8,7 +8,8 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f240be3ee964c491ec8f630ee04c795e
+_md5_=95ea643af5b6c2bb2548116295fe3832
diff --git a/metadata/md5-cache/dev-python/epsilon-0.7.0 b/metadata/md5-cache/dev-python/epsilon-0.7.0
index ec33eb8b4ec8..a938b9af5a16 100644
--- a/metadata/md5-cache/dev-python/epsilon-0.7.0
+++ b/metadata/md5-cache/dev-python/epsilon-0.7.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/twisted-core-13.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/E/Epsilon/Epsilon-0.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d01f3d8503b61b38a569403932e4879
+_md5_=f0dedaa5eb14d33b5501915614b2dda7
diff --git a/metadata/md5-cache/dev-python/epsilon-0.7.1 b/metadata/md5-cache/dev-python/epsilon-0.7.1
index 2e42d6a8727a..186878ea0b41 100644
--- a/metadata/md5-cache/dev-python/epsilon-0.7.1
+++ b/metadata/md5-cache/dev-python/epsilon-0.7.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-13.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/E/Epsilon/Epsilon-0.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c01c463a2bb003aaeb73b3f2bc5740d
+_md5_=f96f1f21441fb79c53554ba60ade8fd6
diff --git a/metadata/md5-cache/dev-python/errorhandler-2.0.1 b/metadata/md5-cache/dev-python/errorhandler-2.0.1
index e5cc7d472cf1..e61d5af98227 100644
--- a/metadata/md5-cache/dev-python/errorhandler-2.0.1
+++ b/metadata/md5-cache/dev-python/errorhandler-2.0.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/errorhandler/errorhandler-2.0.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8f93dac2f284b3ea8d429fc426bca5f2
+_md5_=ad3c057bae9b51b935016d4006a78dce
diff --git a/metadata/md5-cache/dev-python/et_xmlfile-1.0.1 b/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
index 5aa806960766..96e5344241df 100644
--- a/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
+++ b/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/et_xmlfile/et_xmlfile-1.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e45c6b00b3c24c20c5063ffdbec1b988
+_md5_=7dc80e0be1ff25ab9c47d9079954bd3c
diff --git a/metadata/md5-cache/dev-python/eventlet-0.18.4 b/metadata/md5-cache/dev-python/eventlet-0.18.4
index 938843657aee..6372bf7bb2ca 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.18.4
+++ b/metadata/md5-cache/dev-python/eventlet-0.18.4
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.18.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ca9c66195f48590cec7c879126ecdbf
+_md5_=724fd9c439e0af16622fd926bc9263eb
diff --git a/metadata/md5-cache/dev-python/eventlet-0.20.0-r1 b/metadata/md5-cache/dev-python/eventlet-0.20.0-r1
index b181d14522d3..e608061f7f69 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.20.0-r1
+++ b/metadata/md5-cache/dev-python/eventlet-0.20.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=virtual/python-enum34 >=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.20.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fec0b9b88387c3ede5945cd1d49fa51
+_md5_=df9bcee98ad7660991b4446bacd88fd0
diff --git a/metadata/md5-cache/dev-python/eventlet-0.20.1-r1 b/metadata/md5-cache/dev-python/eventlet-0.20.1-r1
index 0920c89cb7b0..f3d489715ca3 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.20.1-r1
+++ b/metadata/md5-cache/dev-python/eventlet-0.20.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.20.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3409a628d93f33113b68e2909f1917e2
+_md5_=f5c9da5f75413786a78741bbf34d990e
diff --git a/metadata/md5-cache/dev-python/eventlet-0.21.0-r1 b/metadata/md5-cache/dev-python/eventlet-0.21.0-r1
index c0aa514d4de4..9240ffd178d0 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.21.0-r1
+++ b/metadata/md5-cache/dev-python/eventlet-0.21.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.21.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce17404cc3041a1b03c3db035d4e7fb2
+_md5_=204600a4d4de57e33b4c59c79a6681f4
diff --git a/metadata/md5-cache/dev-python/eventlet-0.24.1 b/metadata/md5-cache/dev-python/eventlet-0.24.1
index 91943a14637a..b5c77c935a9e 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.24.1
+++ b/metadata/md5-cache/dev-python/eventlet-0.24.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/dnspython-1.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/monotonic-1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.24.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=94312db98284c28c294a6927ff942581
+_md5_=f70a82dce3a826e34eab6893809b088a
diff --git a/metadata/md5-cache/dev-python/eventlet-0.24.1-r1 b/metadata/md5-cache/dev-python/eventlet-0.24.1-r1
index d1a8a2da177c..b4e956ecff25 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.24.1-r1
+++ b/metadata/md5-cache/dev-python/eventlet-0.24.1-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/dnspython-1.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.24.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9d938e3d84f95cfd6e3e7891011c35f4
+_md5_=b6f4291e3a8e607a93b09be8ec664d3a
diff --git a/metadata/md5-cache/dev-python/eventlet-0.25.1 b/metadata/md5-cache/dev-python/eventlet-0.25.1
index f92ebb619aab..879b8837db82 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.25.1
+++ b/metadata/md5-cache/dev-python/eventlet-0.25.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/dnspython-1.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.25.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a9024ab456c4e240150e5fc8447b8fc0
+_md5_=3b34f538f05d8998571f0f42aba7ca46
diff --git a/metadata/md5-cache/dev-python/expects-0.8.0 b/metadata/md5-cache/dev-python/expects-0.8.0
index 7d955eca7332..e9cb17f6643c 100644
--- a/metadata/md5-cache/dev-python/expects-0.8.0
+++ b/metadata/md5-cache/dev-python/expects-0.8.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/expects/expects-0.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b550d24203c2f2b2a64f7ac98cb26b8
+_md5_=57db2ba45201abaa350bb31e6ef33049
diff --git a/metadata/md5-cache/dev-python/extras-0.0.3 b/metadata/md5-cache/dev-python/extras-0.0.3
index 6c019999cbd7..901d0f4a364d 100644
--- a/metadata/md5-cache/dev-python/extras-0.0.3
+++ b/metadata/md5-cache/dev-python/extras-0.0.3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/extras/extras-0.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b6f1a6cdb14cf8222e5ddc5b8af8cac
+_md5_=f61900a54e9d07eab04a36c4c32eb2ae
diff --git a/metadata/md5-cache/dev-python/extras-1.0.0 b/metadata/md5-cache/dev-python/extras-1.0.0
index cf5e4d7867e6..07cb7d417f49 100644
--- a/metadata/md5-cache/dev-python/extras-1.0.0
+++ b/metadata/md5-cache/dev-python/extras-1.0.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/extras/extras-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4290b9610bfe283f1c3c0eade727696b
+_md5_=090dfd7a5af5a90f5f0a9171fb714f12
diff --git a/metadata/md5-cache/dev-python/falcon-0.1.6 b/metadata/md5-cache/dev-python/falcon-0.1.6
index 89d95ecd280f..e72fcd925877 100644
--- a/metadata/md5-cache/dev-python/falcon-0.1.6
+++ b/metadata/md5-cache/dev-python/falcon-0.1.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] cython? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/racker/falcon/archive/0.1.6.tar.gz -> falcon-0.1.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2079047c9d04f6a4c1ebd3eddeb5d505
+_md5_=eec85e9a35749e5a331713e967dd5a9b
diff --git a/metadata/md5-cache/dev-python/falcon-0.1.7 b/metadata/md5-cache/dev-python/falcon-0.1.7
index 78d076d69f64..1c9a763522c9 100644
--- a/metadata/md5-cache/dev-python/falcon-0.1.7
+++ b/metadata/md5-cache/dev-python/falcon-0.1.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/mimeparse[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] cython? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/racker/falcon/archive/0.1.7.tar.gz -> falcon-0.1.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ac4ae827c3b158a086405626fc7f4fb
+_md5_=6bbdbe1b74e9a6417837a7f41cd4c6b9
diff --git a/metadata/md5-cache/dev-python/falcon-0.1.8 b/metadata/md5-cache/dev-python/falcon-0.1.8
index 7646beac9305..247145824dd3 100644
--- a/metadata/md5-cache/dev-python/falcon-0.1.8
+++ b/metadata/md5-cache/dev-python/falcon-0.1.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/mimeparse[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] cython? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/racker/falcon/archive/0.1.8.tar.gz -> falcon-0.1.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b58386b6b6f8bfc3730434e7c2c6f5c2
+_md5_=c0d1ee5bb53bf5f5f4992bc05f586049
diff --git a/metadata/md5-cache/dev-python/falcon-0.1.9 b/metadata/md5-cache/dev-python/falcon-0.1.9
index 9215b1346b72..f43099e7955c 100644
--- a/metadata/md5-cache/dev-python/falcon-0.1.9
+++ b/metadata/md5-cache/dev-python/falcon-0.1.9
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mimeparse[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] cython? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/racker/falcon/archive/0.1.9.tar.gz -> falcon-0.1.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c68d35052434c86c6f66527acf34801
+_md5_=2678b1ffe2d6e85d5987338a02520b82
diff --git a/metadata/md5-cache/dev-python/falcon-1.3.0 b/metadata/md5-cache/dev-python/falcon-1.3.0
index 1e811ac1e44a..a3107d60805a 100644
--- a/metadata/md5-cache/dev-python/falcon-1.3.0
+++ b/metadata/md5-cache/dev-python/falcon-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mimeparse[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] cython? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/racker/falcon/archive/1.3.0.tar.gz -> falcon-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eaab6ae28646eb61486272389ac8c93c
+_md5_=6a60236ccf5a0548753ce51cff467bf4
diff --git a/metadata/md5-cache/dev-python/feedgenerator-1.9 b/metadata/md5-cache/dev-python/feedgenerator-1.9
index dc8ca40c5407..b49f8a662fab 100644
--- a/metadata/md5-cache/dev-python/feedgenerator-1.9
+++ b/metadata/md5-cache/dev-python/feedgenerator-1.9
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/feedgenerator/feedgenerator-1.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dcb7bf67ab17d7fb127b0209e1f1e097
+_md5_=633deb80902de44f147d5e84a60d825f
diff --git a/metadata/md5-cache/dev-python/fixtures-1.4.0 b/metadata/md5-cache/dev-python/fixtures-1.4.0
index eb0b3e4418ae..611cd0fbde7d 100644
--- a/metadata/md5-cache/dev-python/fixtures-1.4.0
+++ b/metadata/md5-cache/dev-python/fixtures-1.4.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=>=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-0.9.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fixtures/fixtures-1.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed711cdddb7fc3a85e15d10c52bb2a83
+_md5_=cbbff50ba0d9cccb774dd624676ad82f
diff --git a/metadata/md5-cache/dev-python/fixtures-3.0.0 b/metadata/md5-cache/dev-python/fixtures-3.0.0
index 659875799e7d..ca5dfb928f24 100644
--- a/metadata/md5-cache/dev-python/fixtures-3.0.0
+++ b/metadata/md5-cache/dev-python/fixtures-3.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~spar
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=>=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-0.9.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fixtures/fixtures-3.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=45a4c781ca7fd99fbc1c3b1abe54bc70
+_md5_=02512e3c8528b58b165073c9c2a3c825
diff --git a/metadata/md5-cache/dev-python/flake8-2.1.0 b/metadata/md5-cache/dev-python/flake8-2.1.0
index 5f7512b790de..ab7a64148194 100644
--- a/metadata/md5-cache/dev-python/flake8-2.1.0
+++ b/metadata/md5-cache/dev-python/flake8-2.1.0
@@ -9,7 +9,8 @@ LICENSE=MIT
 PDEPEND=>=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 RDEPEND=>=dev-python/pyflakes-0.7.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.4.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-2.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1223cbca360159875962e035886b0ad4
+_md5_=f89b171a1a86ef05eb970dc6e71a7606
diff --git a/metadata/md5-cache/dev-python/flake8-2.2.5 b/metadata/md5-cache/dev-python/flake8-2.2.5
index 27712a6ca046..057fd7fbf9cc 100644
--- a/metadata/md5-cache/dev-python/flake8-2.2.5
+++ b/metadata/md5-cache/dev-python/flake8-2.2.5
@@ -9,7 +9,8 @@ LICENSE=MIT
 PDEPEND=>=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 RDEPEND=>=dev-python/pyflakes-0.7.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-2.2.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5cc54821568d03859c982c94aff362d2
+_md5_=99f6947ed3c7a0fbaf44fafbb7647d31
diff --git a/metadata/md5-cache/dev-python/flake8-2.5.4 b/metadata/md5-cache/dev-python/flake8-2.5.4
index da7e68be8e37..78b9a537be50 100644
--- a/metadata/md5-cache/dev-python/flake8-2.5.4
+++ b/metadata/md5-cache/dev-python/flake8-2.5.4
@@ -9,7 +9,8 @@ LICENSE=MIT
 PDEPEND=>=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/mccabe-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 RDEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pyflakes-1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !=dev-python/pep8-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !=dev-python/pep8-1.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-2.5.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99840ae5c58be8f5463aa66018dee9fe
+_md5_=e812015c41a90d46a274b7be22c8837e
diff --git a/metadata/md5-cache/dev-python/flake8-3.5.0 b/metadata/md5-cache/dev-python/flake8-3.5.0
index b09f93d3ed6e..83d877da4a91 100644
--- a/metadata/md5-cache/dev-python/flake8-3.5.0
+++ b/metadata/md5-cache/dev-python/flake8-3.5.0
@@ -9,7 +9,8 @@ LICENSE=MIT
 PDEPEND=>=dev-python/mccabe-0.6.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mccabe-0.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 RDEPEND=>=dev-python/pyflakes-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyflakes-1.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycodestyle-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pycodestyle-2.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-3.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb94e1f01c87f1203952453e9a5f06e9
+_md5_=b3ab326025f3507ac2a1a29f56f7372f
diff --git a/metadata/md5-cache/dev-python/flake8-3.6.0 b/metadata/md5-cache/dev-python/flake8-3.6.0
index ab92bfcffac2..e85fdf4240f0 100644
--- a/metadata/md5-cache/dev-python/flake8-3.6.0
+++ b/metadata/md5-cache/dev-python/flake8-3.6.0
@@ -9,7 +9,8 @@ LICENSE=MIT
 PDEPEND=>=dev-python/mccabe-0.6.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/mccabe-0.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 RDEPEND=>=dev-python/pyflakes-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pyflakes-2.1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycodestyle-2.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pycodestyle-2.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-3.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8aaf6a86d843fca78f81ac32e323220
+_md5_=eabf1b15b264d58ab81e131ee5059e93
diff --git a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.1 b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.1
index 27be3509d1e6..4dd7fe45539f 100644
--- a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.1
+++ b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8-polyfill/flake8-polyfill-1.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b93ee70d53bbf2ad416f554d68be793a
+_md5_=3798212d785ebbca232ac81cdc31b974
diff --git a/metadata/md5-cache/dev-python/flask-api-1.0 b/metadata/md5-cache/dev-python/flask-api-1.0
index 94baef275f28..b7b5f72b81c0 100644
--- a/metadata/md5-cache/dev-python/flask-api-1.0
+++ b/metadata/md5-cache/dev-python/flask-api-1.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flask-api/flask-api/archive/v1.0.tar.gz -> flask-api-1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=601fdb85aa74056fffacfdaa7aba5a85
+_md5_=093ec99606a71b8fbb1100543e0293e6
diff --git a/metadata/md5-cache/dev-python/flask-api-1.1 b/metadata/md5-cache/dev-python/flask-api-1.1
index 85524503590b..bca87968a49b 100644
--- a/metadata/md5-cache/dev-python/flask-api-1.1
+++ b/metadata/md5-cache/dev-python/flask-api-1.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flask-api/flask-api/archive/v1.1.tar.gz -> flask-api-1.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0f2f7b9884c0d78267859cec1808fa58
+_md5_=612c501316ec7ca50fb0999fb4b7c4e2
diff --git a/metadata/md5-cache/dev-python/flask-appconfig-0.11.1-r1 b/metadata/md5-cache/dev-python/flask-appconfig-0.11.1-r1
index d8e8792fa71d..e1a4ab166639 100644
--- a/metadata/md5-cache/dev-python/flask-appconfig-0.11.1-r1
+++ b/metadata/md5-cache/dev-python/flask-appconfig-0.11.1-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/flask-appconfig/archive/0.11.1.tar.gz -> flask-appconfig-0.11.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ae2bfcd5363d84a13c346e181fe0c624
+_md5_=36f2a85904cce69e29bda99b8b66b5e0
diff --git a/metadata/md5-cache/dev-python/flask-babel-0.11.2-r1 b/metadata/md5-cache/dev-python/flask-babel-0.11.2-r1
index 530e6d17131f..4d0c4507c94f 100644
--- a/metadata/md5-cache/dev-python/flask-babel-0.11.2-r1
+++ b/metadata/md5-cache/dev-python/flask-babel-0.11.2-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/Babel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Babel/Flask-Babel-0.11.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7225909ea73e3ea20d4dcc81a6cb97c4
+_md5_=3ad35a70b105b333036161443d522028
diff --git a/metadata/md5-cache/dev-python/flask-babel-0.11.2-r2 b/metadata/md5-cache/dev-python/flask-babel-0.11.2-r2
index 21f034bf90d9..4427c3658c55 100644
--- a/metadata/md5-cache/dev-python/flask-babel-0.11.2-r2
+++ b/metadata/md5-cache/dev-python/flask-babel-0.11.2-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/Babel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Babel/Flask-Babel-0.11.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9ba23ccddefdf40c32edac61dd10bd17
+_md5_=fe5baf1c73c1ca620124b0d256421669
diff --git a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.6.0 b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.6.0
index d7ebd1c04498..3bf6a9341bab 100644
--- a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.6.0
+++ b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.6.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/dominate[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/visitor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/wtforms[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/flask-bootstrap/archive/3.3.6.0.tar.gz -> flask-bootstrap-3.3.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb866b1b8c2dd78231a3dd66c85b13f6
+_md5_=890184ec34f74a023308c904a8009f56
diff --git a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.0 b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.0
index d3ff4e7b57c9..0e13e2e6e124 100644
--- a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.0
+++ b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/dominate[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/visitor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/wtforms[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/flask-bootstrap/archive/3.3.7.0.tar.gz -> flask-bootstrap-3.3.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb866b1b8c2dd78231a3dd66c85b13f6
+_md5_=890184ec34f74a023308c904a8009f56
diff --git a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.1 b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.1
index a8f453b8df42..a1d2746231f2 100644
--- a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.1
+++ b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/dominate[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/visitor[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wtforms[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/flask-bootstrap/archive/3.3.7.1.tar.gz -> flask-bootstrap-3.3.7.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=62b660a3cc17d21fce186c8811a710aa
+_md5_=2f115b9a1860cac082a70329c466d9e2
diff --git a/metadata/md5-cache/dev-python/flask-cors-1.8.0 b/metadata/md5-cache/dev-python/flask-cors-1.8.0
index cda7a85a2c77..7551c16efffa 100644
--- a/metadata/md5-cache/dev-python/flask-cors-1.8.0
+++ b/metadata/md5-cache/dev-python/flask-cors-1.8.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Cors/Flask-Cors-1.8.0.tar.gz -> flask-cors-1.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=04e582d1cfb8c2998e097387d276094b
+_md5_=95d691c0e360cf67e76c569e35a29fc0
diff --git a/metadata/md5-cache/dev-python/flask-cors-1.9.0 b/metadata/md5-cache/dev-python/flask-cors-1.9.0
index 2950700cfc35..56d49ca5a65e 100644
--- a/metadata/md5-cache/dev-python/flask-cors-1.9.0
+++ b/metadata/md5-cache/dev-python/flask-cors-1.9.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Cors/Flask-Cors-1.9.0.tar.gz -> flask-cors-1.9.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14d811d24b074dc5f455565cd072ebf9
+_md5_=e4591191c40d985fce587b4bc41a5ba7
diff --git a/metadata/md5-cache/dev-python/flask-cors-2.1.0 b/metadata/md5-cache/dev-python/flask-cors-2.1.0
index 9538445bbdbb..b773d976a760 100644
--- a/metadata/md5-cache/dev-python/flask-cors-2.1.0
+++ b/metadata/md5-cache/dev-python/flask-cors-2.1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Cors/Flask-Cors-2.1.0.tar.gz -> flask-cors-2.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2590fb3097f7927ee6612fcf58faa6c5
+_md5_=5bbabea357ab45bfba18b27a6f5382c3
diff --git a/metadata/md5-cache/dev-python/flask-debug-0.4.3 b/metadata/md5-cache/dev-python/flask-debug-0.4.3
index 614c12dfa4c1..92f667eda0ec 100644
--- a/metadata/md5-cache/dev-python/flask-debug-0.4.3
+++ b/metadata/md5-cache/dev-python/flask-debug-0.4.3
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/inflection[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/Flask-Debug/archive/0.4.3.tar.gz -> flask-debug-0.4.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f5ac97a92af6e41c986e8306d75ef786
+_md5_=ac958c17534d0df8821f816266ac1382
diff --git a/metadata/md5-cache/dev-python/flask-login-0.3.2-r1 b/metadata/md5-cache/dev-python/flask-login-0.3.2-r1
index 87f5ec1b9162..7bbbffb6cace 100644
--- a/metadata/md5-cache/dev-python/flask-login-0.3.2-r1
+++ b/metadata/md5-cache/dev-python/flask-login-0.3.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.3.2.tar.gz -> flask-login-0.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=416026ff1dcc38d447d9fb003fcca55f
+_md5_=eccea285e7395075f4aaf34a1d9a73ad
diff --git a/metadata/md5-cache/dev-python/flask-login-0.4.1 b/metadata/md5-cache/dev-python/flask-login-0.4.1
index d480f2d5ee5a..2bee0e25ad9d 100644
--- a/metadata/md5-cache/dev-python/flask-login-0.4.1
+++ b/metadata/md5-cache/dev-python/flask-login-0.4.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.4.1.tar.gz -> flask-login-0.4.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7c35784313cce908d105f4de64707c41
+_md5_=5019e7b5bb3f36111325fdac7ccb6a0b
diff --git a/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1 b/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
index 2de0e048881d..3adf1620fc9e 100644
--- a/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Mail/Flask-Mail-0.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78d07d5119afe8f95fdbed73ce797b6a
+_md5_=dd7da7c0a1a49473855d19d11952d122
diff --git a/metadata/md5-cache/dev-python/flask-migrate-2.1.1 b/metadata/md5-cache/dev-python/flask-migrate-2.1.1
index 924910bfce33..d8841724e338 100644
--- a/metadata/md5-cache/dev-python/flask-migrate-2.1.1
+++ b/metadata/md5-cache/dev-python/flask-migrate-2.1.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/alembic-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/flask-sqlalchemy-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-2.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cea1a52785af670482dfe37e3514977a
+_md5_=3369554ca19c74c267e1e8f20eb72478
diff --git a/metadata/md5-cache/dev-python/flask-migrate-2.1.1-r1 b/metadata/md5-cache/dev-python/flask-migrate-2.1.1-r1
index 31fdeae23664..4b3b198b8d69 100644
--- a/metadata/md5-cache/dev-python/flask-migrate-2.1.1-r1
+++ b/metadata/md5-cache/dev-python/flask-migrate-2.1.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/alembic-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-sqlalchemy-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-2.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c602cc4342e19247d3d2c3a5d4daf31
+_md5_=b4839d3f7ff85592220173de7b419d9a
diff --git a/metadata/md5-cache/dev-python/flask-migrate-2.5.2 b/metadata/md5-cache/dev-python/flask-migrate-2.5.2
index 9f17697af601..2435206dbc3d 100644
--- a/metadata/md5-cache/dev-python/flask-migrate-2.5.2
+++ b/metadata/md5-cache/dev-python/flask-migrate-2.5.2
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/alembic-0.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-sqlalchemy-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-2.5.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0aaa883ea380cd04fcab15a34597f3de
+_md5_=20781e8e9bfa97125f6b1b19e5ed7b4c
diff --git a/metadata/md5-cache/dev-python/flask-nav-0.6-r1 b/metadata/md5-cache/dev-python/flask-nav-0.6-r1
index d1d482d18a8f..57bd4d69d0ab 100644
--- a/metadata/md5-cache/dev-python/flask-nav-0.6-r1
+++ b/metadata/md5-cache/dev-python/flask-nav-0.6-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/dominate[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/visitor[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/flask-nav/archive/0.6.tar.gz -> flask-nav-0.6.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e4b9557b741322f5f1028e3176c2616e
+_md5_=58082e4979cedef7aa12a64c048a5c8d
diff --git a/metadata/md5-cache/dev-python/flask-paginate-0.5.3-r1 b/metadata/md5-cache/dev-python/flask-paginate-0.5.3-r1
index 10610da2bf23..6095ae15b186 100644
--- a/metadata/md5-cache/dev-python/flask-paginate-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/flask-paginate-0.5.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lixxu/flask-paginate/archive/510ad833106134711868653fb597bf75ea8ac34f.tar.gz -> flask-paginate-0.5.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d43659a98c7409106664e8c569dbb439
+_md5_=9eb9c9dd9898da46378a966311d4f07a
diff --git a/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1 b/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
index 3e85171dbcda..8c5390430db6 100644
--- a/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miguelgrinberg/flask-paranoid/archive/v0.2.tar.gz -> flask-paranoid-0.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d03074ab98a12432a0675e6c76f2982
+_md5_=115721f0443afcf585a2263847c08539
diff --git a/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1 b/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
index 27387e99b6f1..c76744bda3c7 100644
--- a/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mattupstate/flask-principal/archive/0.4.0.tar.gz -> flask-principal-0.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=589baf5a32b1b87873b97c1383f13893
+_md5_=1f4ee6ad8dfc22c12d7bcea050fe053e
diff --git a/metadata/md5-cache/dev-python/flask-restful-0.3.5-r1 b/metadata/md5-cache/dev-python/flask-restful-0.3.5-r1
index 8c8b3f6ee9f9..e0a461b7baaf 100644
--- a/metadata/md5-cache/dev-python/flask-restful-0.3.5-r1
+++ b/metadata/md5-cache/dev-python/flask-restful-0.3.5-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/aniso8601-0.82[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] paging? ( >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twilio/flask-restful/archive/0.3.5.tar.gz -> flask-restful-0.3.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d7e37f205b59c7583d90ee5bd21ad58
+_md5_=3ec785a006ed69e9ffb87d9cd6cc216d
diff --git a/metadata/md5-cache/dev-python/flask-restful-0.3.6 b/metadata/md5-cache/dev-python/flask-restful-0.3.6
index ef0c85fdae01..693d04299b6b 100644
--- a/metadata/md5-cache/dev-python/flask-restful-0.3.6
+++ b/metadata/md5-cache/dev-python/flask-restful-0.3.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/aniso8601-0.82[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] paging? ( >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twilio/flask-restful/archive/0.3.6.tar.gz -> flask-restful-0.3.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84a6f7c5f871866297d7a6aaa11c0486
+_md5_=acbfe29deb11bebb4253f43f388bd7c5
diff --git a/metadata/md5-cache/dev-python/flask-restful-0.3.7 b/metadata/md5-cache/dev-python/flask-restful-0.3.7
index a52e4b48242e..e915bcb924b0 100644
--- a/metadata/md5-cache/dev-python/flask-restful-0.3.7
+++ b/metadata/md5-cache/dev-python/flask-restful-0.3.7
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/aniso8601-0.82[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] paging? ( >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twilio/flask-restful/archive/0.3.7.tar.gz -> flask-restful-0.3.7.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dcf00ad91d8bcf1b5c18c468606880b9
+_md5_=b494d60f22da89f95209bfb25b5b2f3d
diff --git a/metadata/md5-cache/dev-python/flask-script-2.0.5-r1 b/metadata/md5-cache/dev-python/flask-script-2.0.5-r1
index bc3a50303da1..1683745cce12 100644
--- a/metadata/md5-cache/dev-python/flask-script-2.0.5-r1
+++ b/metadata/md5-cache/dev-python/flask-script-2.0.5-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.10.1-r1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Script/Flask-Script-2.0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4d942ed1a2560ab3697988d04b28bfd
+_md5_=1ed89ba91045a17ca4675cb529afcd54
diff --git a/metadata/md5-cache/dev-python/flask-script-2.0.6 b/metadata/md5-cache/dev-python/flask-script-2.0.6
index 2b651104efec..19cd59507c22 100644
--- a/metadata/md5-cache/dev-python/flask-script-2.0.6
+++ b/metadata/md5-cache/dev-python/flask-script-2.0.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.10.1-r1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Script/Flask-Script-2.0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae1a1f6823ea79c687419055ba43b6cb
+_md5_=c45bd2e6740739eab25c59159a35f34b
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.3.2 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.3.2
index dde0497f10f0..42de631acbc6 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.3.2
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.3.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-0.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sqlalchemy[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d694f6116848e006d7d21621341fba28
+_md5_=aa1a6a222eb1af2dfca5ecdc9f62bd94
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.1 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.1
index 4580973d6c24..1614d12dfcf3 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.1
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-0.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pallets-sphinx-themes[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-issues[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-0.8.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.4.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=287c56e2e90b312fd4ea665d482e46e2
+_md5_=aa2b7ee163084eff148a89884658114b
diff --git a/metadata/md5-cache/dev-python/flask-themes-0.1.3_p20180112 b/metadata/md5-cache/dev-python/flask-themes-0.1.3_p20180112
index 91a26c982303..afcb02064aa4 100644
--- a/metadata/md5-cache/dev-python/flask-themes-0.1.3_p20180112
+++ b/metadata/md5-cache/dev-python/flask-themes-0.1.3_p20180112
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/flask-0.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-themes/archive/9eac2dcc9b81c3af29c2386ce1afba9b446562bf.tar.gz -> flask-themes-0.1.3_p20180112.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=97aa9062ef11fb37c18935bf4af2ad76
+_md5_=5ef99d9f60520ebac45d5e7edb8ad03b
diff --git a/metadata/md5-cache/dev-python/flask-uploads-0.2.0-r1 b/metadata/md5-cache/dev-python/flask-uploads-0.2.0-r1
index 37826ccecfa3..d7107bfb3444 100644
--- a/metadata/md5-cache/dev-python/flask-uploads-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/flask-uploads-0.2.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-uploads/archive/0.2.0.tar.gz -> flask-uploads-0.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=100c5469520e7acabb506ef1a6047997
+_md5_=babbc9023223f2e1b750d6e7c9d90ab2
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.14.2-r1 b/metadata/md5-cache/dev-python/flask-wtf-0.14.2-r1
index 5c30e87fc77b..d2730fa1bbab 100644
--- a/metadata/md5-cache/dev-python/flask-wtf-0.14.2-r1
+++ b/metadata/md5-cache/dev-python/flask-wtf-0.14.2-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/Babel[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask-babel[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itsdangerous[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/werkzeug[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wtforms-1.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-WTF/Flask-WTF-0.14.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2571a4a58f61bf11306a28c6d76a7c0c
+_md5_=8349150a5aab539409e1cdf376bb69ba
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.2 b/metadata/md5-cache/dev-python/flexmock-0.10.2
index bed32f040f60..8ac80305c955 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.2
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flexmock/flexmock-0.10.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8bf02950ccb23e9f6e7fe18eb0622c3
+_md5_=49d06143c543428d3d25f62c35cf0e7a
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.3 b/metadata/md5-cache/dev-python/flexmock-0.10.3
index b8dd67e48328..0e5415c4fdad 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.3
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.3
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flexmock/flexmock-0.10.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a500379432f6d09477dc96acbbed3094
+_md5_=1f343b2e671d5f2290e891ee24b9ffea
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.4 b/metadata/md5-cache/dev-python/flexmock-0.10.4
index 2437f8192afa..a7fdcbdccbdf 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.4
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.4
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flexmock/flexmock-0.10.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cb1d762eb4c4b3d3018cb8b3b197e4df
+_md5_=4802866056b34d2a7f04b2ecda15f199
diff --git a/metadata/md5-cache/dev-python/fonttools-3.24.2 b/metadata/md5-cache/dev-python/fonttools-3.24.2
index c96686c0266e..033f58ba7d4b 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.24.2
+++ b/metadata/md5-cache/dev-python/fonttools-3.24.2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/3.24.2.tar.gz -> fonttools-3.24.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7b99e338908beb9183e69d163090301
+_md5_=3ee041653e44efb61b6e28768e7c1be8
diff --git a/metadata/md5-cache/dev-python/fonttools-3.44.0 b/metadata/md5-cache/dev-python/fonttools-3.44.0
index ec1759e38547..a4994243d047 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.44.0
+++ b/metadata/md5-cache/dev-python/fonttools-3.44.0
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/3.44.0.tar.gz -> fonttools-3.44.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=f4fb1fdd520e9f888b5cd1fed910ced2
+_md5_=a378711a6742a08b9a30eda27db8903b
diff --git a/metadata/md5-cache/dev-python/fonttools-4.0.1 b/metadata/md5-cache/dev-python/fonttools-4.0.1
index 76cdad0489e2..746c1fcd2d63 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.0.1
+++ b/metadata/md5-cache/dev-python/fonttools-4.0.1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/4.0.1.tar.gz -> fonttools-4.0.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=991321a0389b1607e6a051337dd4edf1
+_md5_=c85e1a62b27ea190efdf48a45b2d3fcb
diff --git a/metadata/md5-cache/dev-python/foolscap-0.11.0 b/metadata/md5-cache/dev-python/foolscap-0.11.0
index b32eca111441..0c4ebe60f16e 100644
--- a/metadata/md5-cache/dev-python/foolscap-0.11.0
+++ b/metadata/md5-cache/dev-python/foolscap-0.11.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~
 LICENSE=MIT
 RDEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://foolscap.lothar.com/releases/foolscap-0.11.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a35d443ebddff9529d11e73ea8b6db9
+_md5_=50a2fe2d0764c8d0ef566a37cdacd3bd
diff --git a/metadata/md5-cache/dev-python/foolscap-0.7.0 b/metadata/md5-cache/dev-python/foolscap-0.7.0
index 7568cf3933a0..75cb06ebf6b0 100644
--- a/metadata/md5-cache/dev-python/foolscap-0.7.0
+++ b/metadata/md5-cache/dev-python/foolscap-0.7.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/twisted-core-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-web-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://foolscap.lothar.com/releases/foolscap-0.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f64a381476a62bd7a9b683213723aab2
+_md5_=5e3bf49c1a6abc8d3f006f14e9da2dd0
diff --git a/metadata/md5-cache/dev-python/fqdn-1.1.1 b/metadata/md5-cache/dev-python/fqdn-1.1.1
index 4b6da25d9973..21043da70de8 100644
--- a/metadata/md5-cache/dev-python/fqdn-1.1.1
+++ b/metadata/md5-cache/dev-python/fqdn-1.1.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=dev-python/cached-property[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/guyhughes/fqdn/archive/v1.1.1.tar.gz -> fqdn-1.1.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=01304b440def489d49e6f43bd8934037
+_md5_=f9c5989acacc2819924a8953826aa14a
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.10 b/metadata/md5-cache/dev-python/freezegun-0.3.10
index e92f04d39dc4..0ca1281c2182 100644
--- a/metadata/md5-cache/dev-python/freezegun-0.3.10
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.10
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/python-dateutil-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/freezegun/freezegun-0.3.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8be68ee4d855a6067443dd53260f092c
+_md5_=e38f2d814f3f7278d07c7f6d30991ee2
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.11 b/metadata/md5-cache/dev-python/freezegun-0.3.11
index 67162b93a5d6..f75cea365ad4 100644
--- a/metadata/md5-cache/dev-python/freezegun-0.3.11
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.11
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/python-dateutil-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/freezegun/freezegun-0.3.11.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a93d0006f92cc864cd7fd53654d91154
+_md5_=a3e6f17e2a666a0e5ec29563037601a0
diff --git a/metadata/md5-cache/dev-python/frozen-flask-0.11-r1 b/metadata/md5-cache/dev-python/frozen-flask-0.11-r1
index ff7237c3e066..ad7d35b1a2b2 100644
--- a/metadata/md5-cache/dev-python/frozen-flask-0.11-r1
+++ b/metadata/md5-cache/dev-python/frozen-flask-0.11-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Frozen-Flask/Frozen-Flask-0.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d54465921cec2ea1e861d1426e6e9b9f
+_md5_=64f813d41bf023f062fc91dd650ec2e5
diff --git a/metadata/md5-cache/dev-python/frozen-flask-0.15 b/metadata/md5-cache/dev-python/frozen-flask-0.15
index 28a9afd7553b..5a6403c7a9f2 100644
--- a/metadata/md5-cache/dev-python/frozen-flask-0.15
+++ b/metadata/md5-cache/dev-python/frozen-flask-0.15
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Frozen-Flask/Frozen-Flask-0.15.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d318e2825eb9b72f063c2a6ef7ddea79
+_md5_=01f4837cbcf5fe08ac8c7fbc4cbcbb03
diff --git a/metadata/md5-cache/dev-python/fudge-0.9.6-r1 b/metadata/md5-cache/dev-python/fudge-0.9.6-r1
index b08f57e18b6f..071788e35048 100644
--- a/metadata/md5-cache/dev-python/fudge-0.9.6-r1
+++ b/metadata/md5-cache/dev-python/fudge-0.9.6-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fudge/fudge-0.9.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9cbf310624afef87f37e445934d0afb
+_md5_=1cd321af2ba9d9c43e47ae6b633b57bf
diff --git a/metadata/md5-cache/dev-python/fudge-1.1.0 b/metadata/md5-cache/dev-python/fudge-1.1.0
index 9797196a0b08..328b1c3451b1 100644
--- a/metadata/md5-cache/dev-python/fudge-1.1.0
+++ b/metadata/md5-cache/dev-python/fudge-1.1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fudge/fudge-1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=090e62d9086d82a202a649625e593659
+_md5_=b6c16fe779edadaaca43316807c52213
diff --git a/metadata/md5-cache/dev-python/funcparserlib-0.3.6 b/metadata/md5-cache/dev-python/funcparserlib-0.3.6
index 138c79e69258..68b729b2cc80 100644
--- a/metadata/md5-cache/dev-python/funcparserlib-0.3.6
+++ b/metadata/md5-cache/dev-python/funcparserlib-0.3.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcparserlib/funcparserlib-0.3.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d61e66071797ee8e81bb26377f27223
+_md5_=339be8e83a2b4c201bf5668b4083ca79
diff --git a/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1 b/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
index 40886363347d..244e45ee1f6e 100644
--- a/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcsigs/funcsigs-1.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2f22b01e50afcb6f02d1d91b73d5a7d
+_md5_=7e5b59239ed5f00b29032b64f5c65c87
diff --git a/metadata/md5-cache/dev-python/gammapy-0.6 b/metadata/md5-cache/dev-python/gammapy-0.6
index 7dffedf467e4..26c523e2956b 100644
--- a/metadata/md5-cache/dev-python/gammapy-0.6
+++ b/metadata/md5-cache/dev-python/gammapy-0.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/regions[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gammapy/gammapy-0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ccff3fdcc4974bbe932a60e63d66e548
+_md5_=d2d23663366f50500280eb22eb651f60
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1
index 1aec5300cfb0..3459ba0c1e41 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/boto-2.29.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oauth2client-1.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !=dev-python/oauth2client-2.0* >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/six-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d407cd407152ea9225acb8b044e8cab7
+_md5_=c8e95f51839ddc815f9faeca6d5f1be5
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1-r1 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1-r1
index 625b5f79967f..422e1f90c751 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1-r1
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/boto-2.29.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/google-reauth-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauth2client-1.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/oauth2client-2.0* >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d7c15dac057db7ed3b7931a7335afe2
+_md5_=92e1260f51eebb511c22fa8e62ed5031
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.4 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.4
index 03d8a02e3e35..dfa3c3b5e08d 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.4
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.4
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/boto-2.29.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/google-reauth-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-1.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !=dev-python/oauth2client-2.0* >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d6c6fa93150051ead10268be067b4acc
+_md5_=a68d6da40b02e5b5acdb3c5b2ff48166
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5
index 314362be0abd..98094967d9bc 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/boto-2.29.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/google-reauth-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-1.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !=dev-python/oauth2client-2.0* >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.12.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8075a108d0d856a84401b4693b3a15ed
+_md5_=1b38cd40986b10e11359cf77d9dbd838
diff --git a/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1 b/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
index 65f3b2c92e29..7300c32ccded 100644
--- a/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/geoip-1.4.8 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoip-api-python/archive/v1.3.2.tar.gz -> geoip-api-python-1.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ba68fb72a8114c71a28e066d8e30f28
+_md5_=e5a848031132ae5bbebed6cdbe51ee3a
diff --git a/metadata/md5-cache/dev-python/geopy-1.11.0 b/metadata/md5-cache/dev-python/geopy-1.11.0
index 96521ba67c88..6e4e3d32d0d2 100644
--- a/metadata/md5-cache/dev-python/geopy-1.11.0
+++ b/metadata/md5-cache/dev-python/geopy-1.11.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=yahoo? ( >=dev-python/requests-oauthlib-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/placefinder[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) timezone? ( dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=test? ( yahoo timezone ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/geopy/geopy/archive/1.11.0.tar.gz -> geopy-1.11.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae4c87f6a9d1a36d0ea608a41137535c
+_md5_=55ac9cea32e9677a29af05dfadebe71d
diff --git a/metadata/md5-cache/dev-python/gevent-socketio-0.3.6 b/metadata/md5-cache/dev-python/gevent-socketio-0.3.6
index c859f0eb010c..f734e138d71f 100644
--- a/metadata/md5-cache/dev-python/gevent-socketio-0.3.6
+++ b/metadata/md5-cache/dev-python/gevent-socketio-0.3.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/gevent-websocket[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent-socketio/gevent-socketio-0.3.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d4f24ed3494d362f0e56cdbfb8f32fc
+_md5_=91bb77c18e4d09500b6c5d8636afe7c2
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.3.1 b/metadata/md5-cache/dev-python/geventhttpclient-1.3.1
index 704984e01508..63ff311c6985 100644
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.3.1
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.3.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-maco
 LICENSE=MIT
 RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/gevent[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-1.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50b32075fd4348112d7fe9926ec07713
+_md5_=077da51a6ba8c66692ec12df5a9dded7
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.3.1-r1 b/metadata/md5-cache/dev-python/geventhttpclient-1.3.1-r1
index b912f6511c0f..46e81b3fc7a6 100644
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.3.1-r1
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.3.1-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-ma
 LICENSE=MIT
 RDEPEND=dev-python/certifi[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/gevent[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-1.3.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6accb80ec2c1057518c695169092d0e8
+_md5_=c6fb6273bdd8acca1bcb8fae909ef175
diff --git a/metadata/md5-cache/dev-python/ginga-2.6.5 b/metadata/md5-cache/dev-python/ginga-2.6.5
index 6312207f22be..a96325b90d6e 100644
--- a/metadata/md5-cache/dev-python/ginga-2.6.5
+++ b/metadata/md5-cache/dev-python/ginga-2.6.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/roboto gtk? ( dev-python/pygobject[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),cairo] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),help,gui,widgets] dev-python/QtPy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),gui] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/ginga/ginga-2.6.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a397b7a495fa202607cf1e4b1251fad
+_md5_=f95ec624c57385e9cedf0a7c2fa8ac1b
diff --git a/metadata/md5-cache/dev-python/gitdb2-2.0.3 b/metadata/md5-cache/dev-python/gitdb2-2.0.3
index fdc5f337f4c7..e8a386a83fb4 100644
--- a/metadata/md5-cache/dev-python/gitdb2-2.0.3
+++ b/metadata/md5-cache/dev-python/gitdb2-2.0.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 ~x86
 LICENSE=BSD
 RDEPEND=!dev-python/gitdb[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/smmap2-2.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gitdb2/gitdb2-2.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2466b9f246ee39ca93df0bd53a29b587
+_md5_=f99463e0f9da658eec6b62951018570a
diff --git a/metadata/md5-cache/dev-python/gitlabform-1.0.7 b/metadata/md5-cache/dev-python/gitlabform-1.0.7
index f413de4d6c69..eddc9ee56d61 100644
--- a/metadata/md5-cache/dev-python/gitlabform-1.0.7
+++ b/metadata/md5-cache/dev-python/gitlabform-1.0.7
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-python/pyyaml-3.13[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.20.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/egnyte/gitlabform/archive/v1.0.7.tar.gz -> gitlabform-1.0.7.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2e690ba3e0e7a3008213496eb5271a43
+_md5_=15a405b1974f308b593f043d0b792111
diff --git a/metadata/md5-cache/dev-python/gitlabform-1.3.0 b/metadata/md5-cache/dev-python/gitlabform-1.3.0
index 1f5300a363ef..a4a70e3d1114 100644
--- a/metadata/md5-cache/dev-python/gitlabform-1.3.0
+++ b/metadata/md5-cache/dev-python/gitlabform-1.3.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-python/pyyaml-3.13[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.20.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/egnyte/gitlabform/archive/v1.3.0.tar.gz -> gitlabform-1.3.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2e690ba3e0e7a3008213496eb5271a43
+_md5_=15a405b1974f308b593f043d0b792111
diff --git a/metadata/md5-cache/dev-python/gitlabform-1.5.0 b/metadata/md5-cache/dev-python/gitlabform-1.5.0
index a98f11bdedac..97c50697fb70 100644
--- a/metadata/md5-cache/dev-python/gitlabform-1.5.0
+++ b/metadata/md5-cache/dev-python/gitlabform-1.5.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-python/pyyaml-3.13[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.20.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/egnyte/gitlabform/archive/v1.5.0.tar.gz -> gitlabform-1.5.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=30dee476a20516248339798613b60a37
+_md5_=98632202b4d4fc5804051617e181f3e2
diff --git a/metadata/md5-cache/dev-python/globre-0.1.4 b/metadata/md5-cache/dev-python/globre-0.1.4
index 2f5681b85b08..7e14fb43f1f8 100644
--- a/metadata/md5-cache/dev-python/globre-0.1.4
+++ b/metadata/md5-cache/dev-python/globre-0.1.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/globre/globre-0.1.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c752690f88aabc8263373da1b99d3abb
+_md5_=d2b2cd95d134b7bc7f72385a7e1d6662
diff --git a/metadata/md5-cache/dev-python/globre-0.1.5 b/metadata/md5-cache/dev-python/globre-0.1.5
index 157b21e71a84..3ee209f3fdd3 100644
--- a/metadata/md5-cache/dev-python/globre-0.1.5
+++ b/metadata/md5-cache/dev-python/globre-0.1.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/globre/globre-0.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71e8891140679be312957e852871c6a9
+_md5_=706c6b175eacd16b9ce16b4c38b3c113
diff --git a/metadata/md5-cache/dev-python/glue-vispy-viewers-0.7.2 b/metadata/md5-cache/dev-python/glue-vispy-viewers-0.7.2
index db7b88fc9904..bd3d32a680ee 100644
--- a/metadata/md5-cache/dev-python/glue-vispy-viewers-0.7.2
+++ b/metadata/md5-cache/dev-python/glue-vispy-viewers-0.7.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/glueviz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/QtPy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),designer,gui] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/glue-vispy-viewers/glue-vispy-viewers-0.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8122ced4b6da1bd85ad3ac27925e5720
+_md5_=053362a69b0537aba6c522ef458dd1af
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.5.3 b/metadata/md5-cache/dev-python/google-api-python-client-1.5.3
index 13c3b1e4d223..91ff92326501 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.5.3
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.5.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/oauth2client-3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/uritemplate-0.6[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/uritemplate-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.5.3.tar.gz -> google-api-python-client-1.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14fb9bb06da5d3a02a48c4f7f07006c5
+_md5_=70ae8d01e8797927d2d32aa07f7ed6e9
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.6.2 b/metadata/md5-cache/dev-python/google-api-python-client-1.6.2
index 688cdc0d9d2a..b683e2226e2d 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.6.2
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.6.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/oauth2client-5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/uritemplate-3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/uritemplate-4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.6.2.tar.gz -> google-api-python-client-1.6.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7254231aaac4deebe52ddd3054654894
+_md5_=59cebd2072ce17c0f8896b84043b4f15
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.6.5 b/metadata/md5-cache/dev-python/google-api-python-client-1.6.5
index df8aa4232f7a..065f87a1ad0a 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.6.5
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.6.5
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/oauth2client-5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/uritemplate-3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/uritemplate-4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.6.5.tar.gz -> google-api-python-client-1.6.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=943cef2b6f889a036ce868ef09f7d338
+_md5_=9f72a1ff1229d49ce39b346d8ec83d6b
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.7.0 b/metadata/md5-cache/dev-python/google-api-python-client-1.7.0
index 9a70f74e3354..7f8091b5b8ca 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.7.0
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.7.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-auth-1.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-auth-httplib2-0.0.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/uritemplate-3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/uritemplate-4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.7.0.tar.gz -> google-api-python-client-1.7.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5a77658b1ddce4c03ef41368d79ea5dd
+_md5_=73414083f9a117f16b988d2fa7792252
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.7.9 b/metadata/md5-cache/dev-python/google-api-python-client-1.7.9
index f38eb8f7457f..ee6ee6e70e7f 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.7.9
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.7.9
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-auth-1.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-auth-httplib2-0.0.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/uritemplate-3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/uritemplate-4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.7.9.tar.gz -> google-api-python-client-1.7.9.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5a77658b1ddce4c03ef41368d79ea5dd
+_md5_=73414083f9a117f16b988d2fa7792252
diff --git a/metadata/md5-cache/dev-python/google-apputils-0.4.2-r1 b/metadata/md5-cache/dev-python/google-apputils-0.4.2-r1
index fa916506a3c5..5c594739d103 100644
--- a/metadata/md5-cache/dev-python/google-apputils-0.4.2-r1
+++ b/metadata/md5-cache/dev-python/google-apputils-0.4.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~s
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-dateutil-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2010[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-apputils/google-apputils-0.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c6ae69870c28a5465cf9fed9146c8220
+_md5_=b950ba8d196928ea2f42536e589d8fa0
diff --git a/metadata/md5-cache/dev-python/google-apputils-0.4.2-r2 b/metadata/md5-cache/dev-python/google-apputils-0.4.2-r2
index d2a35eb53a38..51038cefb82a 100644
--- a/metadata/md5-cache/dev-python/google-apputils-0.4.2-r2
+++ b/metadata/md5-cache/dev-python/google-apputils-0.4.2-r2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 LICENSE=Apache-2.0
 RDEPEND=dev-python/namespace-google[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2010[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-apputils/google-apputils-0.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=627d2a2c68841787d0c3ccda1dabcc42
+_md5_=eeb114883bcce8e27383f2b99409c2ef
diff --git a/metadata/md5-cache/dev-python/google-auth-1.0.1 b/metadata/md5-cache/dev-python/google-auth-1.0.1
index 206dcddc5b83..c9ec776a0530 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.0.1
+++ b/metadata/md5-cache/dev-python/google-auth-1.0.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5f3f4e640767d5546c50ad4a390d3acc
+_md5_=c4d70779f363f3e7094234e02fd39f84
diff --git a/metadata/md5-cache/dev-python/google-auth-1.1.0 b/metadata/md5-cache/dev-python/google-auth-1.1.0
index 79c99fb8fadb..29a3eb7fd5ff 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.1.0
+++ b/metadata/md5-cache/dev-python/google-auth-1.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce0d8d95cae17424206867e0f9755bb6
+_md5_=a063ca5501ed18446b64ce40279ebceb
diff --git a/metadata/md5-cache/dev-python/google-auth-1.4.1 b/metadata/md5-cache/dev-python/google-auth-1.4.1
index 68278f7563c5..fac7dd287045 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.4.1
+++ b/metadata/md5-cache/dev-python/google-auth-1.4.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9e7991a239ee8bebc1a18b1c805ca17
+_md5_=b4ca23acc95612bd7dda8e3c6c232431
diff --git a/metadata/md5-cache/dev-python/google-auth-1.6.3 b/metadata/md5-cache/dev-python/google-auth-1.6.3
index 6f9c81379056..547a581bc756 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.6.3
+++ b/metadata/md5-cache/dev-python/google-auth-1.6.3
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.6.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=45d8e4aad5f4117765450870050af115
+_md5_=c20a3d54c7d939df03f8fbe5b903a331
diff --git a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2 b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
index 4ca29c1a07c4..58ae27a59004 100644
--- a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
+++ b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/google-auth[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/607e86011141e8885b1f52826d57c8b5ff588ffc.tar.gz -> google-auth-httplib2-0.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cc55cc8db5c9c7f24d1a0876220c06f9
+_md5_=8d8d6e449265cacb35489070ff96ebfd
diff --git a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.3 b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.3
index ad222cc63911..1be38d3edcfd 100644
--- a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.3
+++ b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.3
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/google-auth[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/e7cd722281d1d897fa9ae6e3b6b78ae142778e6e.tar.gz -> google-auth-httplib2-0.0.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4dc5e0fba69187ef6ba199ef713dddd1
+_md5_=5b2e1967f098afa11ba00c5bb8468aca
diff --git a/metadata/md5-cache/dev-python/google-reauth-python-0.1.0 b/metadata/md5-cache/dev-python/google-reauth-python-0.1.0
index fddf5eeee592..76b801f33ae5 100644
--- a/metadata/md5-cache/dev-python/google-reauth-python-0.1.0
+++ b/metadata/md5-cache/dev-python/google-reauth-python-0.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/oauth2client[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyu2f[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/google-reauth-python/archive/0.1.0.tar.gz -> google-reauth-python-0.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9dd858c2a581beb45b11c3ef42681ba4
+_md5_=ef256dcfd07de06b333593e890631b2d
diff --git a/metadata/md5-cache/dev-python/gql-0.1.0 b/metadata/md5-cache/dev-python/gql-0.1.0
index 6c4da3324cea..b0b307cfaab5 100644
--- a/metadata/md5-cache/dev-python/gql-0.1.0
+++ b/metadata/md5-cache/dev-python/gql-0.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/graphql-core-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/promises-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gql/gql-0.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8a8acd4004c477d8f4072c9f3e8bfa1
+_md5_=5e4cb55bcf846e4c8265ad4b2549beca
diff --git a/metadata/md5-cache/dev-python/graphviz-0.10.1 b/metadata/md5-cache/dev-python/graphviz-0.10.1
index 95ef25f8c791..763510d111dc 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.10.1
+++ b/metadata/md5-cache/dev-python/graphviz-0.10.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphviz/graphviz-0.10.1.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f88289a0d2e0c91d65f18d9665e4e8c
+_md5_=bf8e075ffb70bb9f4429b0698ddefb1b
diff --git a/metadata/md5-cache/dev-python/graphviz-0.13 b/metadata/md5-cache/dev-python/graphviz-0.13
index fae4f9c07cb2..8b073c53c32c 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.13
+++ b/metadata/md5-cache/dev-python/graphviz-0.13
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphviz/graphviz-0.13.zip
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6875f8b5fdff3b7f7e300137ebba14ef
+_md5_=22d774de32ef1671056a2a7b909793d4
diff --git a/metadata/md5-cache/dev-python/graphviz-0.7.1 b/metadata/md5-cache/dev-python/graphviz-0.7.1
index c8ccdff809e4..18ef397d8fb9 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.7.1
+++ b/metadata/md5-cache/dev-python/graphviz-0.7.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphviz/graphviz-0.7.1.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bcd90334c8b86d795f1806493c431700
+_md5_=6d1cb0cb41bcc1560ab65866bbcd63a4
diff --git a/metadata/md5-cache/dev-python/greenstalk-1.0.1 b/metadata/md5-cache/dev-python/greenstalk-1.0.1
index 481502f36363..2c5b36a6f24b 100644
--- a/metadata/md5-cache/dev-python/greenstalk-1.0.1
+++ b/metadata/md5-cache/dev-python/greenstalk-1.0.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mayhewj/greenstalk/archive/v1.0.1.tar.gz -> greenstalk-1.0.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ecb2b88d98915b8377392ed9825e1951
+_md5_=3b900265c7b1476fe11b210530e809c1
diff --git a/metadata/md5-cache/dev-python/guessit-3.0.0 b/metadata/md5-cache/dev-python/guessit-3.0.0
index d98183193f50..fd33f138056a 100644
--- a/metadata/md5-cache/dev-python/guessit-3.0.0
+++ b/metadata/md5-cache/dev-python/guessit-3.0.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rebulk-0.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/guessit/guessit-3.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50f9daa925a322c7fbd3557bef21777f
+_md5_=bd8ba858d78844ac2d2db9a846e9c943
diff --git a/metadata/md5-cache/dev-python/guessit-9999 b/metadata/md5-cache/dev-python/guessit-9999
index 1914629355d4..88dccff37bf6 100644
--- a/metadata/md5-cache/dev-python/guessit-9999
+++ b/metadata/md5-cache/dev-python/guessit-9999
@@ -8,6 +8,7 @@ LICENSE=LGPL-3
 PROPERTIES=live
 RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rebulk-0.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6dc8050e9393e2cbd87451343c2ed4ca
+_md5_=75848f187b5863b5a607cd3880838ee9
diff --git a/metadata/md5-cache/dev-python/gwcs-0.7 b/metadata/md5-cache/dev-python/gwcs-0.7
index 092db233c00d..1a6d8ac8cd2c 100644
--- a/metadata/md5-cache/dev-python/gwcs-0.7
+++ b/metadata/md5-cache/dev-python/gwcs-0.7
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/asdf[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gwcs/gwcs-0.7.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ae6a27fafa5f6db8beeb02d0b1dd15fd
+_md5_=a737ed1d3d68a58bad27f827ac96ae89
diff --git a/metadata/md5-cache/dev-python/h11-0.7.0 b/metadata/md5-cache/dev-python/h11-0.7.0
index 1b56a82f53be..e3bca20e49c2 100644
--- a/metadata/md5-cache/dev-python/h11-0.7.0
+++ b/metadata/md5-cache/dev-python/h11-0.7.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h11/h11-0.7.0.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e867da076647375023cb240bf9347574
+_md5_=b59ceb168d685919d5b81608e6aee6d3
diff --git a/metadata/md5-cache/dev-python/h11-0.8.1 b/metadata/md5-cache/dev-python/h11-0.8.1
index 7b687c449118..0592395f2491 100644
--- a/metadata/md5-cache/dev-python/h11-0.8.1
+++ b/metadata/md5-cache/dev-python/h11-0.8.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h11/h11-0.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=919ca6a9c603d52ef3ff261e94a5477a
+_md5_=5b4441af56218a0c0bc901b64758088b
diff --git a/metadata/md5-cache/dev-python/h5py-2.7.0 b/metadata/md5-cache/dev-python/h5py-2.7.0
index 3954fb9891bc..eacb7154fe03 100644
--- a/metadata/md5-cache/dev-python/h5py-2.7.0
+++ b/metadata/md5-cache/dev-python/h5py-2.7.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/hdf5:=[mpi=,hl(+)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-2.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=853d0b5612a9c007652f35a6ffa608b9
+_md5_=b234b59eb38e59b1aea9566b96f62e88
diff --git a/metadata/md5-cache/dev-python/h5py-2.7.1 b/metadata/md5-cache/dev-python/h5py-2.7.1
index 69a17c6712a7..8041aca6340c 100644
--- a/metadata/md5-cache/dev-python/h5py-2.7.1
+++ b/metadata/md5-cache/dev-python/h5py-2.7.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/hdf5:=[mpi=,hl(+)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-2.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e716fe7848f01dcdd49a51a501c14d4
+_md5_=18edddd90772846ab22918afcd47f6d8
diff --git a/metadata/md5-cache/dev-python/h5py-2.9.0 b/metadata/md5-cache/dev-python/h5py-2.9.0
index 7a1aa1f442fa..af3aefe01821 100644
--- a/metadata/md5-cache/dev-python/h5py-2.9.0
+++ b/metadata/md5-cache/dev-python/h5py-2.9.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/hdf5:=[mpi=,hl(+)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-2.9.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e716fe7848f01dcdd49a51a501c14d4
+_md5_=18edddd90772846ab22918afcd47f6d8
diff --git a/metadata/md5-cache/dev-python/hacking-0.10.3 b/metadata/md5-cache/dev-python/hacking-0.10.3
index bcc6708930fd..efaaf3ada562 100644
--- a/metadata/md5-cache/dev-python/hacking-0.10.3
+++ b/metadata/md5-cache/dev-python/hacking-0.10.3
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-l
 LICENSE=Apache-2.0
 RDEPEND=~dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/flake8-2.2.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hacking/hacking-0.10.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=64d91a5353e3400cdc0423af4e77986a
+_md5_=5eb17adbacf06ba7ca151da252dc5018
diff --git a/metadata/md5-cache/dev-python/hacking-0.9.2 b/metadata/md5-cache/dev-python/hacking-0.9.2
index f671220103ee..a4b4bd2caef3 100644
--- a/metadata/md5-cache/dev-python/hacking-0.9.2
+++ b/metadata/md5-cache/dev-python/hacking-0.9.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=~dev-python/pep8-1.5.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/flake8-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hacking/hacking-0.9.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60094e87f39c75379b9d12ab25260fbd
+_md5_=9dfc9965a416909c996b2240f1fc9c8f
diff --git a/metadata/md5-cache/dev-python/hacking-0.9.6 b/metadata/md5-cache/dev-python/hacking-0.9.6
index 0eef03098dbb..591b3379428a 100644
--- a/metadata/md5-cache/dev-python/hacking-0.9.6
+++ b/metadata/md5-cache/dev-python/hacking-0.9.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~hppa ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=~dev-python/pep8-1.5.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/flake8-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hacking/hacking-0.9.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a27983bbc09ae7dd46da279cfccef5d1
+_md5_=afa53a49fe95e033f335f2a083ea0654
diff --git a/metadata/md5-cache/dev-python/hacking-1.1.0 b/metadata/md5-cache/dev-python/hacking-1.1.0
index e16222083116..edb9ea6230bd 100644
--- a/metadata/md5-cache/dev-python/hacking-1.1.0
+++ b/metadata/md5-cache/dev-python/hacking-1.1.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 ~hppa ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/flake8-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/flake8-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hacking/hacking-1.1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6cc4ef529b3b96c87ae1fa47f757dcf0
+_md5_=6c22e1f80b1297810cbcb06bb349c0a8
diff --git a/metadata/md5-cache/dev-python/hcs-utils-1.5 b/metadata/md5-cache/dev-python/hcs-utils-1.5
index 2785dc9a72d9..3732c5a39552 100644
--- a/metadata/md5-cache/dev-python/hcs-utils-1.5
+++ b/metadata/md5-cache/dev-python/hcs-utils-1.5
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hcs_utils/hcs_utils-1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14c99e5c8556dd75fec6b85b722f429e
+_md5_=a780238c030ce43759a6c040a177c390
diff --git a/metadata/md5-cache/dev-python/hcs-utils-2.0 b/metadata/md5-cache/dev-python/hcs-utils-2.0
index c6e997c71c6b..d20174317f5b 100644
--- a/metadata/md5-cache/dev-python/hcs-utils-2.0
+++ b/metadata/md5-cache/dev-python/hcs-utils-2.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hcs_utils/hcs_utils-2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2b9a70c421685e2c433148656da35a4
+_md5_=e526b2805098274f290143bf3ab6a8a7
diff --git a/metadata/md5-cache/dev-python/healpy-1.10.3 b/metadata/md5-cache/dev-python/healpy-1.10.3
index babf27015898..f06cddea3064 100644
--- a/metadata/md5-cache/dev-python/healpy-1.10.3
+++ b/metadata/md5-cache/dev-python/healpy-1.10.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-astronomy/healpix:=[cxx] sci-libs/cfitsio:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/healpy/healpy-1.10.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cce34b8a716f3a11299633263769a863
+_md5_=8b55f432ce7d2065dbd4cb4177a575dd
diff --git a/metadata/md5-cache/dev-python/healpy-1.11.0 b/metadata/md5-cache/dev-python/healpy-1.11.0
index 1c6c3a70ca0a..6725b7e88b6a 100644
--- a/metadata/md5-cache/dev-python/healpy-1.11.0
+++ b/metadata/md5-cache/dev-python/healpy-1.11.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-astronomy/healpix:=[cxx] sci-libs/cfitsio:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/healpy/healpy-1.11.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6e0a32894d10edf6c819d446f0089d7
+_md5_=a0a82f6ee7b75eb11007582d3516fc87
diff --git a/metadata/md5-cache/dev-python/hgdistver-0.25 b/metadata/md5-cache/dev-python/hgdistver-0.25
index f79ee783b500..5c2900587470 100644
--- a/metadata/md5-cache/dev-python/hgdistver-0.25
+++ b/metadata/md5-cache/dev-python/hgdistver-0.25
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hgdistver/hgdistver-0.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c5efc3004c3c7f540cc8f3d7ccad6e76
+_md5_=5cff4111e398db9d97aa520c5cfd678b
diff --git a/metadata/md5-cache/dev-python/hglib-1.5 b/metadata/md5-cache/dev-python/hglib-1.5
index 23466efe7588..f765b3bc6662 100644
--- a/metadata/md5-cache/dev-python/hglib-1.5
+++ b/metadata/md5-cache/dev-python/hglib-1.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-vcs/mercurial-2.4.2 python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-hglib/python-hglib-1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=441dc93476bbb26b1530c61ac858db92
+_md5_=9330a173a665ee81b7f1d3e1da1b1ea7
diff --git a/metadata/md5-cache/dev-python/hglib-2.1 b/metadata/md5-cache/dev-python/hglib-2.1
index c7c370fe3c32..b6ad9f7bec0a 100644
--- a/metadata/md5-cache/dev-python/hglib-2.1
+++ b/metadata/md5-cache/dev-python/hglib-2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-vcs/mercurial-2.4.2 python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-hglib/python-hglib-2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=478124ca6cae6c439085ed7003808ae1
+_md5_=a1cf38fe84b9819d50e334eff9dfd396
diff --git a/metadata/md5-cache/dev-python/hiro-0.2 b/metadata/md5-cache/dev-python/hiro-0.2
index 119dc7108925..94e83fe42fe2 100644
--- a/metadata/md5-cache/dev-python/hiro-0.2
+++ b/metadata/md5-cache/dev-python/hiro-0.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiro/hiro-0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=010c216001f2f7e78a7c61275e38023a
+_md5_=466eb2c495ee19282c6043efbb891da0
diff --git a/metadata/md5-cache/dev-python/hiro-0.3 b/metadata/md5-cache/dev-python/hiro-0.3
index d72ee4879b4b..80f568529c8f 100644
--- a/metadata/md5-cache/dev-python/hiro-0.3
+++ b/metadata/md5-cache/dev-python/hiro-0.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiro/hiro-0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e00708ddfd7157697917eb56bba108da
+_md5_=20587d7381398045e3c87e05c7ed6a3b
diff --git a/metadata/md5-cache/dev-python/hiro-0.5 b/metadata/md5-cache/dev-python/hiro-0.5
index ad431175c24f..5726d6bfab21 100644
--- a/metadata/md5-cache/dev-python/hiro-0.5
+++ b/metadata/md5-cache/dev-python/hiro-0.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiro/hiro-0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a67e3e44483d7cc94fa7803b7686182e
+_md5_=95679a17602fadfafe0e9f334e717e67
diff --git a/metadata/md5-cache/dev-python/hp3parclient-2.0.0 b/metadata/md5-cache/dev-python/hp3parclient-2.0.0
index 4def58548a67..1d5d68a25bb8 100644
--- a/metadata/md5-cache/dev-python/hp3parclient-2.0.0
+++ b/metadata/md5-cache/dev-python/hp3parclient-2.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.6.0 python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hp3parclient/hp3parclient-2.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ccf00e46ace4bd3cebd9fb535ea084df
+_md5_=ec7c0487dd1ef3c6b6bd15c36294c33c
diff --git a/metadata/md5-cache/dev-python/hp3parclient-3.0.0 b/metadata/md5-cache/dev-python/hp3parclient-3.0.0
index 0c134bd7f8b7..b73f063391f2 100644
--- a/metadata/md5-cache/dev-python/hp3parclient-3.0.0
+++ b/metadata/md5-cache/dev-python/hp3parclient-3.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.6.0 python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hp3parclient/hp3parclient-3.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f7272a5a8e35e06a95d6b07d97f2c4e
+_md5_=caa56a18494e4498f5a915537ffd6e4a
diff --git a/metadata/md5-cache/dev-python/html5lib-0.9999999 b/metadata/md5-cache/dev-python/html5lib-0.9999999
index 1ee7b66ebb84..7d40abdb54e9 100644
--- a/metadata/md5-cache/dev-python/html5lib-0.9999999
+++ b/metadata/md5-cache/dev-python/html5lib-0.9999999
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~am
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-0.9999999.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=403d494d5371af0727e15a2ac858da67
+_md5_=c38dc1711975a2493f95a70dbda176cc
diff --git a/metadata/md5-cache/dev-python/html5lib-0.999999999 b/metadata/md5-cache/dev-python/html5lib-0.999999999
index 2dd0bea064ad..46007c907e5b 100644
--- a/metadata/md5-cache/dev-python/html5lib-0.999999999
+++ b/metadata/md5-cache/dev-python/html5lib-0.999999999
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/webencodings[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-0.999999999.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b283ad5e75faf74c62e2562034064f4
+_md5_=9cf93b87e4a967e51aa3d3cd03b40e75
diff --git a/metadata/md5-cache/dev-python/httpauth-0.3 b/metadata/md5-cache/dev-python/httpauth-0.3
index 29692a4ca11e..0f06a7f45686 100644
--- a/metadata/md5-cache/dev-python/httpauth-0.3
+++ b/metadata/md5-cache/dev-python/httpauth-0.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpauth/httpauth-0.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c3278378ae0b0d804072a4ebf3600b6c
+_md5_=d937be9e1ff88f491848f88c3f7b55c5
diff --git a/metadata/md5-cache/dev-python/httpretty-0.8.14 b/metadata/md5-cache/dev-python/httpretty-0.8.14
index 1e6f06bf1b91..b412022494d6 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.8.14
+++ b/metadata/md5-cache/dev-python/httpretty-0.8.14
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.8.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3bea92e3b96bb5a47919fd0073e572ba
+_md5_=7e056b2d6c1fdba91ac04ef0204f94eb
diff --git a/metadata/md5-cache/dev-python/humanfriendly-4.17 b/metadata/md5-cache/dev-python/humanfriendly-4.17
index 1700182470fc..6fbd35b5bf75 100644
--- a/metadata/md5-cache/dev-python/humanfriendly-4.17
+++ b/metadata/md5-cache/dev-python/humanfriendly-4.17
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/monotonic[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xolox/python-humanfriendly/archive/4.17.tar.gz -> humanfriendly-4.17.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d9436d753de155912606ecd9f4e8e4b9
+_md5_=84e55887e6dc334b8bb0ed47e1cda356
diff --git a/metadata/md5-cache/dev-python/humanize-0.5.1 b/metadata/md5-cache/dev-python/humanize-0.5.1
index f1598d9b2067..556262a4adff 100644
--- a/metadata/md5-cache/dev-python/humanize-0.5.1
+++ b/metadata/md5-cache/dev-python/humanize-0.5.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmoiron/humanize/archive/0.5.1.tar.gz -> humanize-0.5.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=022f24e58992e82ef103ad69520325b8
+_md5_=5894d2dd37bd9eddce5c82a04fbb3e86
diff --git a/metadata/md5-cache/dev-python/icalendar-3.11.7 b/metadata/md5-cache/dev-python/icalendar-3.11.7
index 910d9b7311a1..f037cacde248 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.11.7
+++ b/metadata/md5-cache/dev-python/icalendar-3.11.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.11.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=388bb599c4f219798bae9d1a17168309
+_md5_=dd54b7c3d1a40f34d267562777fc7fe5
diff --git a/metadata/md5-cache/dev-python/icalendar-3.11.7-r1 b/metadata/md5-cache/dev-python/icalendar-3.11.7-r1
index 849c8831f722..48616f5ade0f 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.11.7-r1
+++ b/metadata/md5-cache/dev-python/icalendar-3.11.7-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.11.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2706efeb72f065813554471deb544f8
+_md5_=0d3ca2e70ac3580734e307a16b93773c
diff --git a/metadata/md5-cache/dev-python/icalendar-3.9.2 b/metadata/md5-cache/dev-python/icalendar-3.9.2
index 35012014f232..031ce9d09e43 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.9.2
+++ b/metadata/md5-cache/dev-python/icalendar-3.9.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.9.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ace354acaafe0a87f6d90157a015f16
+_md5_=656923f2bf201060003dba1c65f43297
diff --git a/metadata/md5-cache/dev-python/icalendar-4.0.3 b/metadata/md5-cache/dev-python/icalendar-4.0.3
index 1e2c54337a0c..1f0c40122196 100644
--- a/metadata/md5-cache/dev-python/icalendar-4.0.3
+++ b/metadata/md5-cache/dev-python/icalendar-4.0.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-4.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c9a8bdcb14eab2067d27bc6a22b85e7
+_md5_=9076042733a2dc0157fa668a6cc2dbe6
diff --git a/metadata/md5-cache/dev-python/imapclient-0.13 b/metadata/md5-cache/dev-python/imapclient-0.13
index 20c33a793c67..535b78056cd9 100644
--- a/metadata/md5-cache/dev-python/imapclient-0.13
+++ b/metadata/md5-cache/dev-python/imapclient-0.13
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/I/IMAPClient/IMAPClient-0.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8c68edff8f5aae27b14d751026dfdc8
+_md5_=1947e018680458b4dba6ce59b4c4128b
diff --git a/metadata/md5-cache/dev-python/imapclient-2.1.0 b/metadata/md5-cache/dev-python/imapclient-2.1.0
index 5b5bdc0bb208..beb3345e2de6 100644
--- a/metadata/md5-cache/dev-python/imapclient-2.1.0
+++ b/metadata/md5-cache/dev-python/imapclient-2.1.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mjs/imapclient/archive/2.1.0.tar.gz -> imapclient-2.1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d2d9ed8dde45285b7a55a190ec8e3ec1
+_md5_=bd88fcb4f9bcaf0c6b4163675d6702ee
diff --git a/metadata/md5-cache/dev-python/imexam-0.7.1 b/metadata/md5-cache/dev-python/imexam-0.7.1
index 6d1cacdfa884..ed532333c205 100644
--- a/metadata/md5-cache/dev-python/imexam-0.7.1
+++ b/metadata/md5-cache/dev-python/imexam-0.7.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ginga[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/imexam/imexam-0.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c1949cfc1c208b227fdaf484bdd6f817
+_md5_=ec93b78d6a8f3a713353402135f16206
diff --git a/metadata/md5-cache/dev-python/iminuit-1.2 b/metadata/md5-cache/dev-python/iminuit-1.2
index e46ec297e708..3599e5b2e5d5 100644
--- a/metadata/md5-cache/dev-python/iminuit-1.2
+++ b/metadata/md5-cache/dev-python/iminuit-1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT LGPL-2
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iminuit/iminuit-1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed99a74df6663b2713bf4503fe403553
+_md5_=a4b90679286e1fb269b22890e4250408
diff --git a/metadata/md5-cache/dev-python/iminuit-1.3.3 b/metadata/md5-cache/dev-python/iminuit-1.3.3
index 22d68a26ff59..7f202477924f 100644
--- a/metadata/md5-cache/dev-python/iminuit-1.3.3
+++ b/metadata/md5-cache/dev-python/iminuit-1.3.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT LGPL-2
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iminuit/iminuit-1.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed99a74df6663b2713bf4503fe403553
+_md5_=a4b90679286e1fb269b22890e4250408
diff --git a/metadata/md5-cache/dev-python/importlib_resources-1.0.2-r1 b/metadata/md5-cache/dev-python/importlib_resources-1.0.2-r1
index 9a69537460f4..4220cc74abb3 100644
--- a/metadata/md5-cache/dev-python/importlib_resources-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/importlib_resources-1.0.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/python-typing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-1.0.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=49bcfe84cc9449c935264bcb548c0726
+_md5_=5a5a375cfb171d0b9fcdca32f603ae43
diff --git a/metadata/md5-cache/dev-python/inflect-0.2.5 b/metadata/md5-cache/dev-python/inflect-0.2.5
index 847656a94234..aa3792dd536d 100644
--- a/metadata/md5-cache/dev-python/inflect-0.2.5
+++ b/metadata/md5-cache/dev-python/inflect-0.2.5
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=AGPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/inflect/inflect-0.2.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94b07f53947e2078cede02e8194b2d09
+_md5_=54198951280e0952cd7d52ec0ce4c057
diff --git a/metadata/md5-cache/dev-python/inflect-2.1.0 b/metadata/md5-cache/dev-python/inflect-2.1.0
index 3cebce359129..ab608fac0105 100644
--- a/metadata/md5-cache/dev-python/inflect-2.1.0
+++ b/metadata/md5-cache/dev-python/inflect-2.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/inflect/inflect-2.1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ed1cf6acc4a5024275a1fb8b8fef9a4a
+_md5_=b30b94da9c78a6baeb357b9cdad4410d
diff --git a/metadata/md5-cache/dev-python/inflection-0.3.1 b/metadata/md5-cache/dev-python/inflection-0.3.1
index 61f43ea94050..5a2fae7b39ca 100644
--- a/metadata/md5-cache/dev-python/inflection-0.3.1
+++ b/metadata/md5-cache/dev-python/inflection-0.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jpvanhal/inflection/archive/0.3.1.tar.gz -> inflection-0.3.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1167ffa82442c3feefdf53186d158583
+_md5_=b0bbc950fab3a048c6c0b4894be228aa
diff --git a/metadata/md5-cache/dev-python/influxdb-2.12.0 b/metadata/md5-cache/dev-python/influxdb-2.12.0
index a5286515604d..1acbb9313bee 100644
--- a/metadata/md5-cache/dev-python/influxdb-2.12.0
+++ b/metadata/md5-cache/dev-python/influxdb-2.12.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-1.0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/influxdb/influxdb-2.12.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c3b1732eb612e24e09b901f1cfd54a80
+_md5_=28a0aee07fe6d3cfdf2ecf96dc82a26a
diff --git a/metadata/md5-cache/dev-python/inotifyx-0.2.2 b/metadata/md5-cache/dev-python/inotifyx-0.2.2
index 365274fe9ea7..2e8b670fd4ad 100644
--- a/metadata/md5-cache/dev-python/inotifyx-0.2.2
+++ b/metadata/md5-cache/dev-python/inotifyx-0.2.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/inotifyx/dev/v0.2.2/+download/inotifyx-0.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=219215bd114d3749a017c46d60a08ef2
+_md5_=b856fac6fad1333a9b4efefd4c365e57
diff --git a/metadata/md5-cache/dev-python/intervaltree-2.1.0 b/metadata/md5-cache/dev-python/intervaltree-2.1.0
index e2446edb52cd..42b6959e4db4 100644
--- a/metadata/md5-cache/dev-python/intervaltree-2.1.0
+++ b/metadata/md5-cache/dev-python/intervaltree-2.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/intervaltree/intervaltree-2.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=efbaa23315f76872bb9a863a3a03f0b5
+_md5_=013872af4f3e89f566aef21566228b9b
diff --git a/metadata/md5-cache/dev-python/iocapture-0.1.2-r1 b/metadata/md5-cache/dev-python/iocapture-0.1.2-r1
index e1f7606a1680..d62ca8acfdec 100644
--- a/metadata/md5-cache/dev-python/iocapture-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/iocapture-0.1.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oinume/iocapture/archive/0.1.2.tar.gz -> iocapture-0.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d7e248ce1be17909ca21b63686f13f8
+_md5_=42d0ad76e3b4873ce0ccf6e01bb506b9
diff --git a/metadata/md5-cache/dev-python/iocapture-0.1.2-r2 b/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
index 664e509ba13d..452582f90be8 100644
--- a/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
+++ b/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oinume/iocapture/archive/0.1.2.tar.gz -> iocapture-0.1.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e45c22b9da8939906f6592565de9a720
+_md5_=9983821e4d378e45e2f23ebdf71f0dbf
diff --git a/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2 b/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
index 9b0a114dc566..ea04c2797d34 100644
--- a/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
+++ b/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=<dev-python/ipython-6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-4.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83be8040ae5b698c12f30f14c6ca51bf
+_md5_=ceed398fd0a22bd5b737ef663aba0d10
diff --git a/metadata/md5-cache/dev-python/ipykernel-4.8.2 b/metadata/md5-cache/dev-python/ipykernel-4.8.2
index a8c2bff05aca..0d68b84868d3 100644
--- a/metadata/md5-cache/dev-python/ipykernel-4.8.2
+++ b/metadata/md5-cache/dev-python/ipykernel-4.8.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=<dev-python/ipython-6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-4.8.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eeabc33279433fcd4229882717a87dfd
+_md5_=e2af32df855f8e9f2bada5d8091f5124
diff --git a/metadata/md5-cache/dev-python/ipykernel-5.1.0 b/metadata/md5-cache/dev-python/ipykernel-5.1.0
index 6f72a31e2771..056a7bd0053a 100644
--- a/metadata/md5-cache/dev-python/ipykernel-5.1.0
+++ b/metadata/md5-cache/dev-python/ipykernel-5.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/ipython-6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-5.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e2fa8daebf63dcb172c8c78bdff05c4
+_md5_=c7ac19cf56d91d0cffaabc5141b9f573
diff --git a/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1 b/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
index b3fc267aa496..81e3d5c23714 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
+++ b/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/decorator[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<dev-python/ipython-4.0.0[smp,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ipython-4.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/notebook[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-6.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=313722b449a7f64efd6b84ed1a55c161
+_md5_=2366e102dc02a6ffd03e3c232a4e9f47
diff --git a/metadata/md5-cache/dev-python/ipyparallel-6.2.3 b/metadata/md5-cache/dev-python/ipyparallel-6.2.3
index 85db1fe7a583..dbda37cde2c2 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-6.2.3
+++ b/metadata/md5-cache/dev-python/ipyparallel-6.2.3
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/decorator[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-6.2.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c454f005d18b1a7d8e7b4543db12708c
+_md5_=497ae85f416059a3d288249a3f594315
diff --git a/metadata/md5-cache/dev-python/ipython-5.4.1-r2 b/metadata/md5-cache/dev-python/ipython-5.4.1-r2
index 20ebacc006eb..907e061b3c2c 100644
--- a/metadata/md5-cache/dev-python/ipython-5.4.1-r2
+++ b/metadata/md5-cache/dev-python/ipython-5.4.1-r2
@@ -9,7 +9,8 @@ LICENSE=BSD
 PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipywidgets[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) qt5? ( dev-python/qtconsole[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) smp? ( dev-python/ipyparallel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 RDEPEND=dev-python/decorator[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jedi-0.10.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pickleshare[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prompt_toolkit-2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyparsing[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplegeneric[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/python-pathlib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] nbconvert? ( dev-python/nbconvert[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-5.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62ab8a5927edb1541fe4c6f9d4acb65e
+_md5_=18054bf35b5c6dd103733ab177fe0424
diff --git a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0 b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
index 91ac9db860b6..68a73df7143d 100644
--- a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
+++ b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython_genutils/ipython_genutils-0.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5209655b1ba014a707911f859c8d694
+_md5_=4e6e6b66855d569a3437dfc028ef2a6e
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.0.0 b/metadata/md5-cache/dev-python/ipywidgets-7.0.0
index a5cd910e11b5..dd52d9cf29ac 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.0.0
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.0.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbformat-4.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.3.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/widgetsnbextension-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2677a25374bcc556f2e6a8b22ba5c19
+_md5_=94ab0f06e5051b1deeb6b798d758f08c
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.4.2 b/metadata/md5-cache/dev-python/ipywidgets-7.4.2
index c4dac7c80396..75b285bb5e8d 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.4.2
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.4.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbformat-4.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.3.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/widgetsnbextension-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d49099108e975f42fbbb2719703abedb
+_md5_=b9c4a31823df7d10dc2310126726d147
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.4.2-r1 b/metadata/md5-cache/dev-python/ipywidgets-7.4.2-r1
index 93929b5294a6..759a9d4c359e 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.4.2-r1
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.4.2-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbformat-4.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.3.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/widgetsnbextension-3.4.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.4.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4a6645187dfe8e2215c1999109437545
+_md5_=13671d9cf509c45ef4fe6c96717eb08b
diff --git a/metadata/md5-cache/dev-python/irc-16.3 b/metadata/md5-cache/dev-python/irc-16.3
index 55343628f62c..4695e960cfbd 100644
--- a/metadata/md5-cache/dev-python/irc-16.3
+++ b/metadata/md5-cache/dev-python/irc-16.3
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jaraco-functools-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jaraco-itertools-1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tempora-1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-collections[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-logging[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-stream[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-text[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/more-itertools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/irc/irc-16.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c6f42d00768fcfb0561ffc094c646174
+_md5_=b020aff0087dc9d8556d532cd77156f5
diff --git a/metadata/md5-cache/dev-python/irc-17.0 b/metadata/md5-cache/dev-python/irc-17.0
index 999410663155..99c4d73e0223 100644
--- a/metadata/md5-cache/dev-python/irc-17.0
+++ b/metadata/md5-cache/dev-python/irc-17.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jaraco-itertools-1.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tempora-1.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-collections[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-logging[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-stream[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-text[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/more-itertools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/irc/irc-17.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f76152a6b3a9c9777cc4ec8ab34a5dac
+_md5_=bf6a20b809d5c4f0b94ade98bd0557ce
diff --git a/metadata/md5-cache/dev-python/irc-17.1 b/metadata/md5-cache/dev-python/irc-17.1
index 8ab7328d127d..0450d3647c60 100644
--- a/metadata/md5-cache/dev-python/irc-17.1
+++ b/metadata/md5-cache/dev-python/irc-17.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/importlib_metadata[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-collections[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jaraco-functools-1.20[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jaraco-itertools-1.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-logging[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-stream[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-text[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/more-itertools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tempora-1.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/irc/irc-17.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a91e6f337ca60bdb5ddb60bcc0f4fb64
+_md5_=c00ed5f94ab2ada2ca92f7eb955f887a
diff --git a/metadata/md5-cache/dev-python/isodate-0.6.0 b/metadata/md5-cache/dev-python/isodate-0.6.0
index ab958e3a3ef8..02c7d0e34e1b 100644
--- a/metadata/md5-cache/dev-python/isodate-0.6.0
+++ b/metadata/md5-cache/dev-python/isodate-0.6.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~am
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/isodate/isodate-0.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=759939dc617f56680da293fbece38162
+_md5_=d28a35255493756f179e0eaed60d41ba
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-1.4 b/metadata/md5-cache/dev-python/jaraco-classes-1.4
index be1fe30c5e74..634db5b2c6e5 100644
--- a/metadata/md5-cache/dev-python/jaraco-classes-1.4
+++ b/metadata/md5-cache/dev-python/jaraco-classes-1.4
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.classes/jaraco.classes-1.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e7ea6037446dcb2a2a29008128e1d34
+_md5_=2fd6fa3234922bbde4c08fc0671e6bfe
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-1.5-r1 b/metadata/md5-cache/dev-python/jaraco-classes-1.5-r1
index a9f1e72608f7..12d1a0475c1e 100644
--- a/metadata/md5-cache/dev-python/jaraco-classes-1.5-r1
+++ b/metadata/md5-cache/dev-python/jaraco-classes-1.5-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=<dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.classes/jaraco.classes-1.5.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3a5280ff4f0f2b2ba893ac698e937505
+_md5_=a87c93be583d55f1d24055cdb678d99a
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-2.0 b/metadata/md5-cache/dev-python/jaraco-classes-2.0
index c2e63d9b17f7..2de903f295d4 100644
--- a/metadata/md5-cache/dev-python/jaraco-classes-2.0
+++ b/metadata/md5-cache/dev-python/jaraco-classes-2.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.classes/jaraco.classes-2.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b373b08f8a23c6c1e71fdbc5aa8dbad9
+_md5_=3971bb89b6107ade9eee29825f6f58b4
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-1.5.3-r1 b/metadata/md5-cache/dev-python/jaraco-collections-1.5.3-r1
index f5f004ea89ed..5344f1bdfce1 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-1.5.3-r1
+++ b/metadata/md5-cache/dev-python/jaraco-collections-1.5.3-r1
@@ -10,7 +10,8 @@ LICENSE=MIT
 PDEPEND=dev-python/jaraco-text[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 RDEPEND=<dev-python/namespace-jaraco-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-classes[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-1.5.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=addaf11b457ac2d133dc3120ce432096
+_md5_=b12e1d45dd9b5c5fd61c2fdc8983dd2e
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-1.6.0-r1 b/metadata/md5-cache/dev-python/jaraco-collections-1.6.0-r1
index 089e8865f440..bd3f0af3b1f3 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-1.6.0-r1
+++ b/metadata/md5-cache/dev-python/jaraco-collections-1.6.0-r1
@@ -10,7 +10,8 @@ LICENSE=MIT
 PDEPEND=dev-python/jaraco-text[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 RDEPEND=<dev-python/namespace-jaraco-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-classes[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-1.6.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=95e242b10022be9461811913f414ee9f
+_md5_=a1bc42f370d47f9b3678b38529c54ed6
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-2.0 b/metadata/md5-cache/dev-python/jaraco-collections-2.0
index cfc8e1748402..4551e2c5254b 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-2.0
+++ b/metadata/md5-cache/dev-python/jaraco-collections-2.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-classes[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-text[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-2.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ff59e41bef4f54fa4ac9f1ec4fad220f
+_md5_=dbd85af6ebe6a2c0d183f283f1323b3d
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-2.1 b/metadata/md5-cache/dev-python/jaraco-collections-2.1
index 3f50406bf75e..c88fb768b72d 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-2.1
+++ b/metadata/md5-cache/dev-python/jaraco-collections-2.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-classes[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jaraco-text[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-2.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ff59e41bef4f54fa4ac9f1ec4fad220f
+_md5_=dbd85af6ebe6a2c0d183f283f1323b3d
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-1.19-r1 b/metadata/md5-cache/dev-python/jaraco-functools-1.19-r1
index a56cc2317c1a..686c0aa72585 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-1.19-r1
+++ b/metadata/md5-cache/dev-python/jaraco-functools-1.19-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=<dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-1.19.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=29eebf0cf96dbcffb3eb4d1a679f7437
+_md5_=9503e1e9f318ff8eb37f3e09f27c6698
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-1.20-r1 b/metadata/md5-cache/dev-python/jaraco-functools-1.20-r1
index 351d60998f11..af5d40b77fdf 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-1.20-r1
+++ b/metadata/md5-cache/dev-python/jaraco-functools-1.20-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=<dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-1.20.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=15506389941961d5e8125d779abb8b9a
+_md5_=d5c777e2687c0fc20e4aaa20c021a8be
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-2.0 b/metadata/md5-cache/dev-python/jaraco-functools-2.0
index 7c3cfbf93ea0..648cd04debbe 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-2.0
+++ b/metadata/md5-cache/dev-python/jaraco-functools-2.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-2.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9a3ad8ef60b112052620f03219d2f9b3
+_md5_=61f0eb17c8c843a8ddc077213543d803
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-2.3-r1 b/metadata/md5-cache/dev-python/jaraco-itertools-2.3-r1
index e8d062f527a3..27803726e196 100644
--- a/metadata/md5-cache/dev-python/jaraco-itertools-2.3-r1
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-2.3-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=<dev-python/namespace-jaraco-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/inflect[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/more-itertools-4.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-2.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=68a9bff50a4ccb5d63c508fcf24f737c
+_md5_=c18236c57087d2594decbde38acdaf6c
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-3.0.0-r1 b/metadata/md5-cache/dev-python/jaraco-itertools-3.0.0-r1
index a1a87ec237a9..3a528c4510cd 100644
--- a/metadata/md5-cache/dev-python/jaraco-itertools-3.0.0-r1
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-3.0.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=<dev-python/namespace-jaraco-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/inflect[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/more-itertools-4.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-3.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=63ac0364183dc7ba6516a172979d7972
+_md5_=1b2921e184cc53858ce7db9bd615f972
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-4.4.2 b/metadata/md5-cache/dev-python/jaraco-itertools-4.4.2
index 368c09fecde7..d4facabab063 100644
--- a/metadata/md5-cache/dev-python/jaraco-itertools-4.4.2
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-4.4.2
@@ -9,7 +9,8 @@ KEYWORDS=amd64 arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/inflect[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/more-itertools-4.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-4.4.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=93c4c515115907d1be55d0779f2c718e
+_md5_=58a5450ed497e831f60e1bb5b10f9bfa
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-1.5 b/metadata/md5-cache/dev-python/jaraco-logging-1.5
index 1cfdb6974d25..51cfe5a7845e 100644
--- a/metadata/md5-cache/dev-python/jaraco-logging-1.5
+++ b/metadata/md5-cache/dev-python/jaraco-logging-1.5
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/tempora[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.logging/jaraco.logging-1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b593c4a854295acebc5e45bd575aa388
+_md5_=78a20364256f2d163dd84c64e5bc214f
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-1.5.2-r1 b/metadata/md5-cache/dev-python/jaraco-logging-1.5.2-r1
index 201372133e5d..f74131e8837d 100644
--- a/metadata/md5-cache/dev-python/jaraco-logging-1.5.2-r1
+++ b/metadata/md5-cache/dev-python/jaraco-logging-1.5.2-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=<dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/tempora[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.logging/jaraco.logging-1.5.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=94b77552f1cce7c4ee7c0d9970d0e4ce
+_md5_=2c4bc12d582b4fd52298f1961b10e8a0
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-2.0 b/metadata/md5-cache/dev-python/jaraco-logging-2.0
index 2fe110d3bb2f..8ea16e082b4e 100644
--- a/metadata/md5-cache/dev-python/jaraco-logging-2.0
+++ b/metadata/md5-cache/dev-python/jaraco-logging-2.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/tempora[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.logging/jaraco.logging-2.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9a8f770ec2078a8b4c72005ad8230d7e
+_md5_=627eddcf25a344552816174008001048
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-4.1 b/metadata/md5-cache/dev-python/jaraco-packaging-4.1
index 1bcf0fd64dcc..8f60d22dcbe3 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-4.1
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-4.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/six-1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be2adbb3037b16a000c01e20c6efdc10
+_md5_=79b06e896328167efc0b03017d9b3de3
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-5.1-r1 b/metadata/md5-cache/dev-python/jaraco-packaging-5.1-r1
index daaa2bf2335f..e0d02e9f8af1 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-5.1-r1
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-5.1-r1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/six-1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/namespace-jaraco-2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-5.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=902e857c97197d03eb12e08a6f22988c
+_md5_=45dd1e4f03abb5191a6c4e56e5fa9790
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-6.1 b/metadata/md5-cache/dev-python/jaraco-packaging-6.1
index 698135499af7..daf7ab9a9f64 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-6.1
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-6.1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=MIT
 RDEPEND=>=dev-python/six-1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/namespace-jaraco-2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-6.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=347bb4afad7b4ddab65220155d11bcf5
+_md5_=812a2ae98cfa5090b685c4d9e3d2c185
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-6.2 b/metadata/md5-cache/dev-python/jaraco-packaging-6.2
index ab3831a2ddf8..16e623fd86d5 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-6.2
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-6.2
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=MIT
 RDEPEND=dev-python/importlib_metadata[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/namespace-jaraco-2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-6.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2aaaefb0e52f7f654445ad72de0472a8
+_md5_=6efb306b1b4d167a5d4523f1a32b7925
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-1.1.1 b/metadata/md5-cache/dev-python/jaraco-stream-1.1.1
index 983ed62e665b..35a3a44b19dc 100644
--- a/metadata/md5-cache/dev-python/jaraco-stream-1.1.1
+++ b/metadata/md5-cache/dev-python/jaraco-stream-1.1.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/more-itertools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.stream/jaraco.stream-1.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d330ea6b45ea1302aaa3ab2cc82814b6
+_md5_=a2a8d22efd0e50593bcda52503187e56
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-1.2-r1 b/metadata/md5-cache/dev-python/jaraco-stream-1.2-r1
index 18b569852697..67b7da4895a1 100644
--- a/metadata/md5-cache/dev-python/jaraco-stream-1.2-r1
+++ b/metadata/md5-cache/dev-python/jaraco-stream-1.2-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=<dev-python/namespace-jaraco-2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.stream/jaraco.stream-1.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a1e4321adfa4ddb466f5ba4e298c9aa2
+_md5_=de7120218ad23b76c37c6dcdcb1f0c0c
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-2.0-r1 b/metadata/md5-cache/dev-python/jaraco-stream-2.0-r1
index 53f2cbabe88e..78d732e55494 100644
--- a/metadata/md5-cache/dev-python/jaraco-stream-2.0-r1
+++ b/metadata/md5-cache/dev-python/jaraco-stream-2.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.stream/jaraco.stream-2.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d0652de940e96ba65f950e7e945c3fef
+_md5_=765d972801f5f36c1fd6f482732f7f95
diff --git a/metadata/md5-cache/dev-python/jaraco-text-1.10.1-r1 b/metadata/md5-cache/dev-python/jaraco-text-1.10.1-r1
index d14ab06f513d..8e59d682cd48 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-1.10.1-r1
+++ b/metadata/md5-cache/dev-python/jaraco-text-1.10.1-r1
@@ -10,7 +10,8 @@ LICENSE=MIT
 PDEPEND=dev-python/jaraco-collections[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 RDEPEND=dev-python/jaraco-functools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/namespace-jaraco-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-1.10.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ce8cdd7b9c0883c2fe2afa327cd34886
+_md5_=986fb717c01cf7fd6f64158d177a3350
diff --git a/metadata/md5-cache/dev-python/jaraco-text-3.1 b/metadata/md5-cache/dev-python/jaraco-text-3.1
index 4a2a275c38d6..db38262cfba9 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-3.1
+++ b/metadata/md5-cache/dev-python/jaraco-text-3.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/jaraco-functools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/namespace-jaraco-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/importlib_resources[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/importlib_resources[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/importlib_resources[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-3.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=43ec4d2877e072e5668c6993f2ad7cac
+_md5_=5557627d2037fa3e78e2038723ab24a0
diff --git a/metadata/md5-cache/dev-python/jedi-0.10.2 b/metadata/md5-cache/dev-python/jedi-0.10.2
index 86d29e63d261..d39ea586dfc9 100644
--- a/metadata/md5-cache/dev-python/jedi-0.10.2
+++ b/metadata/md5-cache/dev-python/jedi-0.10.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.10.2.tar.gz -> jedi-0.10.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a451015df6943c7ae1956092b6d82bff
+_md5_=bf75677bcad55ccc61bee30b36b85ae8
diff --git a/metadata/md5-cache/dev-python/jedi-0.12.1 b/metadata/md5-cache/dev-python/jedi-0.12.1
index b597cb1db479..108deb5e6f0a 100644
--- a/metadata/md5-cache/dev-python/jedi-0.12.1
+++ b/metadata/md5-cache/dev-python/jedi-0.12.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/parso-0.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.12.1.tar.gz -> jedi-0.12.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e39cc0ac127f08dc6078f9d3f75e5a9
+_md5_=f11d15c43e79583f07b88cc83093db97
diff --git a/metadata/md5-cache/dev-python/jeepney-0.3.1 b/metadata/md5-cache/dev-python/jeepney-0.3.1
index 735dca7c2cb2..5e2a6be5ef8a 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.3.1
+++ b/metadata/md5-cache/dev-python/jeepney-0.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.3.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cc4e309bec915e68af742a53281489d8
+_md5_=819a3a8caa8e25ad75ae000c27acfbea
diff --git a/metadata/md5-cache/dev-python/jellyfish-0.7.2 b/metadata/md5-cache/dev-python/jellyfish-0.7.2
index 4927a9a7568c..87b45cc06968 100644
--- a/metadata/md5-cache/dev-python/jellyfish-0.7.2
+++ b/metadata/md5-cache/dev-python/jellyfish-0.7.2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jellyfish/jellyfish-0.7.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d604c2d40241d1149ffa15393f31396d
+_md5_=e0bc3449e2f7a2c62f53566e6849750d
diff --git a/metadata/md5-cache/dev-python/jinja2-time-0.2.0 b/metadata/md5-cache/dev-python/jinja2-time-0.2.0
index c3ea9f4a4882..05cb360ab0d6 100644
--- a/metadata/md5-cache/dev-python/jinja2-time-0.2.0
+++ b/metadata/md5-cache/dev-python/jinja2-time-0.2.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/arrow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jinja2-time/jinja2-time-0.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=43148f1c599a624ee0f9b70c4e048154
+_md5_=bd4ecde316a2675052a13f4c6e318eb7
diff --git a/metadata/md5-cache/dev-python/jmespath-0.9.3-r1 b/metadata/md5-cache/dev-python/jmespath-0.9.3-r1
index 3d5a6aee8955..1fa1f0ca3b7e 100644
--- a/metadata/md5-cache/dev-python/jmespath-0.9.3-r1
+++ b/metadata/md5-cache/dev-python/jmespath-0.9.3-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jmespath/jmespath-0.9.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1b113b40a979d3a0821a1a0ad8768762
+_md5_=d7741f5d8d019ba542b08566d72315de
diff --git a/metadata/md5-cache/dev-python/joblib-0.10.0 b/metadata/md5-cache/dev-python/joblib-0.10.0
index 51827796f6d2..4a91a5c535db 100644
--- a/metadata/md5-cache/dev-python/joblib-0.10.0
+++ b/metadata/md5-cache/dev-python/joblib-0.10.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/joblib/joblib-0.10.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=985c4deeaab2480345c22fbc1c7eff83
+_md5_=80d8421d21dd4578a5e905f7d8f4b6b9
diff --git a/metadata/md5-cache/dev-python/joblib-0.11 b/metadata/md5-cache/dev-python/joblib-0.11
index 8cf16d49dda4..055e50c8de28 100644
--- a/metadata/md5-cache/dev-python/joblib-0.11
+++ b/metadata/md5-cache/dev-python/joblib-0.11
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/joblib/joblib-0.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1a22e7bfad85c7e486ecbdce69b4af3
+_md5_=38900f79972dd9af07c834f8dc032d05
diff --git a/metadata/md5-cache/dev-python/joblib-0.12.2 b/metadata/md5-cache/dev-python/joblib-0.12.2
index 90bcb6f244aa..c7eabef66106 100644
--- a/metadata/md5-cache/dev-python/joblib-0.12.2
+++ b/metadata/md5-cache/dev-python/joblib-0.12.2
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/joblib/joblib-0.12.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3924d38f053115327fa07ab6475c9cd9
+_md5_=d7cc3ecd87d7c6c27c5df44a3317c5d4
diff --git a/metadata/md5-cache/dev-python/jplephem-2.6 b/metadata/md5-cache/dev-python/jplephem-2.6
index 253005e4e1f7..1423f06cd8e1 100644
--- a/metadata/md5-cache/dev-python/jplephem-2.6
+++ b/metadata/md5-cache/dev-python/jplephem-2.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jplephem/jplephem-2.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05a35030f836a0e2cccc039686af4595
+_md5_=3373496f152b7698a965c17119570bc7
diff --git a/metadata/md5-cache/dev-python/json-rpc-1.11.0 b/metadata/md5-cache/dev-python/json-rpc-1.11.0
index 52d2ef25c2fe..173ac3b1a475 100644
--- a/metadata/md5-cache/dev-python/json-rpc-1.11.0
+++ b/metadata/md5-cache/dev-python/json-rpc-1.11.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/json-rpc/json-rpc-1.11.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ca55bf7ba36f52b20af33ab205441fa
+_md5_=3591b82268461f5fd680e328454b8168
diff --git a/metadata/md5-cache/dev-python/json-tools-0.4.0 b/metadata/md5-cache/dev-python/json-tools-0.4.0
index 9769140fff66..d622eb9f8438 100644
--- a/metadata/md5-cache/dev-python/json-tools-0.4.0
+++ b/metadata/md5-cache/dev-python/json-tools-0.4.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/json_tools/json_tools-0.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=690e9ae828739ad13193f046338f6339
+_md5_=83e4acd509115b40887b4547be3815c6
diff --git a/metadata/md5-cache/dev-python/json-tools-0.4.1 b/metadata/md5-cache/dev-python/json-tools-0.4.1
index 41f6888be9fb..dfaa5044c972 100644
--- a/metadata/md5-cache/dev-python/json-tools-0.4.1
+++ b/metadata/md5-cache/dev-python/json-tools-0.4.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/json_tools/json_tools-0.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27b4778688943ab4fa822378c085a7e2
+_md5_=0cdc398deccdfe6c4fee018727cce1b9
diff --git a/metadata/md5-cache/dev-python/jsonpickle-0.9.3 b/metadata/md5-cache/dev-python/jsonpickle-0.9.3
index d24e0756f068..c40ff17048fc 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-0.9.3
+++ b/metadata/md5-cache/dev-python/jsonpickle-0.9.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/feedparser[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/demjson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-0.9.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08b7cfb0b018ad6739102b5c7409496b
+_md5_=f3f0d7aed50c7b48cbc88da15a968d2d
diff --git a/metadata/md5-cache/dev-python/jsonpickle-1.2 b/metadata/md5-cache/dev-python/jsonpickle-1.2
index 2bbf7a113c3a..2736a770b6c6 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-1.2
+++ b/metadata/md5-cache/dev-python/jsonpickle-1.2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/feedparser[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-1.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=64249e8e6b491a1a792e8225528a9f79
+_md5_=56c11e494f4fe6dea28140af6af28bc0
diff --git a/metadata/md5-cache/dev-python/jsonref-0.1 b/metadata/md5-cache/dev-python/jsonref-0.1
index 60ed1de39eff..dcd9886a8da4 100644
--- a/metadata/md5-cache/dev-python/jsonref-0.1
+++ b/metadata/md5-cache/dev-python/jsonref-0.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonref/jsonref-0.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c467a02e4c40a1605e1e146e65733987
+_md5_=4e456535d419d0c1be9ca15212e79df3
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.3.0 b/metadata/md5-cache/dev-python/jsonschema-2.3.0
index 28b6be3c0446..580de53a6847 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.3.0
+++ b/metadata/md5-cache/dev-python/jsonschema-2.3.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dca649196f98db05faa4a99663554e00
+_md5_=be0b0a0aaaa16bebc4f4dfc712c3da55
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.4.0 b/metadata/md5-cache/dev-python/jsonschema-2.4.0
index 5468a38c053f..f24f28c2b7df 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.4.0
+++ b/metadata/md5-cache/dev-python/jsonschema-2.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=193e25c8d9dce7b5eceed8055c8af29d
+_md5_=d7bd9e4f90e323c0ace0f4621e39341b
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.5.1-r2 b/metadata/md5-cache/dev-python/jsonschema-2.5.1-r2
index 6e28f4b75332..8216d25a7238 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.5.1-r2
+++ b/metadata/md5-cache/dev-python/jsonschema-2.5.1-r2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 sh sparc x8
 LICENSE=MIT
 RDEPEND=dev-python/rfc3986[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/strict-rfc3339[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/webcolors[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/functools32[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=00f8054042c14c8142e8f67b69b3a146
+_md5_=6be24c2c90e25410113bcc703abe281e
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.6.0 b/metadata/md5-cache/dev-python/jsonschema-2.6.0
index 898541d38feb..f34fcfb300e5 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.6.0
+++ b/metadata/md5-cache/dev-python/jsonschema-2.6.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh spar
 LICENSE=MIT
 RDEPEND=dev-python/rfc3987[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/strict-rfc3339[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/webcolors[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/functools32[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bca0936c6ba4f8a7e9d31b6ddd9d5b96
+_md5_=b6a157554c9aad1513fac360a0c99e3d
diff --git a/metadata/md5-cache/dev-python/jsonschema-3.0.1 b/metadata/md5-cache/dev-python/jsonschema-3.0.1
index 0dc4384d62f2..8567d9308520 100644
--- a/metadata/md5-cache/dev-python/jsonschema-3.0.1
+++ b/metadata/md5-cache/dev-python/jsonschema-3.0.1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=dev-python/rfc3987[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/strict-rfc3339[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/webcolors[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrsistent[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/attrs-17.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/functools32[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-3.0.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=df99f0c418cee6c7b593bed5d580fa72
+_md5_=c0117864d96f80d1f67801c375b7786d
diff --git a/metadata/md5-cache/dev-python/junit-xml-1.8 b/metadata/md5-cache/dev-python/junit-xml-1.8
index 954bce043de8..581bc4d6710d 100644
--- a/metadata/md5-cache/dev-python/junit-xml-1.8
+++ b/metadata/md5-cache/dev-python/junit-xml-1.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/junit-xml/junit-xml-1.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0fe4a39e6cb4bad84ae8f6e1e05ff9bb
+_md5_=a370c2efa8fb454431a09c8a39344ad6
diff --git a/metadata/md5-cache/dev-python/jupyter_client-5.1.0-r1 b/metadata/md5-cache/dev-python/jupyter_client-5.1.0-r1
index fd793b049d71..2f42403df044 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-5.1.0-r1
+++ b/metadata/md5-cache/dev-python/jupyter_client-5.1.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fd23f8685573e38cfdeba4898def797
+_md5_=f28059a93dfb653ebafe6eb25a321567
diff --git a/metadata/md5-cache/dev-python/jupyter_client-5.2.3 b/metadata/md5-cache/dev-python/jupyter_client-5.2.3
index 438980c35837..4cbd77507f54 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-5.2.3
+++ b/metadata/md5-cache/dev-python/jupyter_client-5.2.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a3d1ce26a31a57a36784d9ca9fd2e41
+_md5_=3013f2694296c06db962d2809ec096d9
diff --git a/metadata/md5-cache/dev-python/jupyter_client-5.2.3-r1 b/metadata/md5-cache/dev-python/jupyter_client-5.2.3-r1
index a21df5e4f05f..33a412cfdd96 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-5.2.3-r1
+++ b/metadata/md5-cache/dev-python/jupyter_client-5.2.3-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.2.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e11c43edff92f7825c4c04e14ac8a5e1
+_md5_=a4335a737396e47e32faac6843c889de
diff --git a/metadata/md5-cache/dev-python/jupyter_client-5.2.4 b/metadata/md5-cache/dev-python/jupyter_client-5.2.4
index 6cf099216a90..756688f97648 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-5.2.4
+++ b/metadata/md5-cache/dev-python/jupyter_client-5.2.4
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.2.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=70688ec099aff18d8d95100d14f21f99
+_md5_=1b0793c2dece864c0c04d4c2d51beacb
diff --git a/metadata/md5-cache/dev-python/jupyter_console-4.0.3 b/metadata/md5-cache/dev-python/jupyter_console-4.0.3
index 0cbf3bc22634..cba447638e3e 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-4.0.3
+++ b/metadata/md5-cache/dev-python/jupyter_console-4.0.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/ipython[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/ipykernel[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-4.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=623c6892591209d161a4b02b2ffcd1e2
+_md5_=45347e64b4079fbf91334ead014361eb
diff --git a/metadata/md5-cache/dev-python/jupyter_console-4.1.1 b/metadata/md5-cache/dev-python/jupyter_console-4.1.1
index c127381f48e9..39471d262685 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-4.1.1
+++ b/metadata/md5-cache/dev-python/jupyter_console-4.1.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/ipython[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/ipykernel[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-4.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c7d29bf49355d644ff2b7982c30cfc1
+_md5_=0901bf6696b4f278aaf971c0111c0b98
diff --git a/metadata/md5-cache/dev-python/jupyter_console-5.0.0 b/metadata/md5-cache/dev-python/jupyter_console-5.0.0
index 01d7721f7c2d..6c329ceee13f 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-5.0.0
+++ b/metadata/md5-cache/dev-python/jupyter_console-5.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/ipython[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/ipykernel[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=dev-python/prompt_toolkit-1.0.0[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-5.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5929c98ea489a235dbc05a0958237ed9
+_md5_=368cbd036d70ade7e1b70cb05029d40f
diff --git a/metadata/md5-cache/dev-python/jupyter_console-5.1.0 b/metadata/md5-cache/dev-python/jupyter_console-5.1.0
index 6a5472e79768..c64d2ed5b58d 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-5.1.0
+++ b/metadata/md5-cache/dev-python/jupyter_console-5.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/ipython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-5.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d001a1c6dc7b23c9575d7163a7ca96b
+_md5_=b56f3029791b7b96aa20680698692173
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.0.0 b/metadata/md5-cache/dev-python/jupyter_console-6.0.0
index 662a055d898e..5f67889ae1eb 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-6.0.0
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/ipython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-6.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d001a1c6dc7b23c9575d7163a7ca96b
+_md5_=b56f3029791b7b96aa20680698692173
diff --git a/metadata/md5-cache/dev-python/jwcrypto-0.4.2 b/metadata/md5-cache/dev-python/jwcrypto-0.4.2
index 3f0adbcfead4..8b91848dd0a8 100644
--- a/metadata/md5-cache/dev-python/jwcrypto-0.4.2
+++ b/metadata/md5-cache/dev-python/jwcrypto-0.4.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=LGPL-3+
 RDEPEND=>=dev-python/cryptography-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/latchset/jwcrypto/archive/v0.4.2.tar.gz -> jwcrypto-0.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=16983740baaaa1baa2425f7914e0a910
+_md5_=280b84f2528e6aff642cb377864c50b6
diff --git a/metadata/md5-cache/dev-python/kafka-python-1.3.3 b/metadata/md5-cache/dev-python/kafka-python-1.3.3
index d779bcbdc9ae..94dde980e32f 100644
--- a/metadata/md5-cache/dev-python/kafka-python-1.3.3
+++ b/metadata/md5-cache/dev-python/kafka-python-1.3.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=snappy? ( dev-python/snappy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dpkp/kafka-python/archive/1.3.3.tar.gz -> kafka-python-1.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95ea4bf98d88d9c78470c38b90b50ba0
+_md5_=854f57ca9c67e4c863c0de994cbf7045
diff --git a/metadata/md5-cache/dev-python/kaptan-0.5.12 b/metadata/md5-cache/dev-python/kaptan-0.5.12
index 7659bf7b1499..af756a57dc8b 100644
--- a/metadata/md5-cache/dev-python/kaptan-0.5.12
+++ b/metadata/md5-cache/dev-python/kaptan-0.5.12
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=kaptan
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.13[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kaptan/kaptan-0.5.12.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b1fcd604ec5868eb89f9ec19696ee6be
+_md5_=865dbb4218571e74612359dc4892513e
diff --git a/metadata/md5-cache/dev-python/keepassx-0.1.0-r1 b/metadata/md5-cache/dev-python/keepassx-0.1.0-r1
index e8b5a9d682b4..796a5918d275 100644
--- a/metadata/md5-cache/dev-python/keepassx-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/keepassx-0.1.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=|| ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/prettytable[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jamesls/python-keepassx/archive/0.1.0.tar.gz -> keepassx-0.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d95fcaacb9931bf26c888a946c72d2e8
+_md5_=baf0f69cbe45e3960734bcefc72ffbeb
diff --git a/metadata/md5-cache/dev-python/keyring-13.2.1 b/metadata/md5-cache/dev-python/keyring-13.2.1
index 161d19587d38..032e7f15646d 100644
--- a/metadata/md5-cache/dev-python/keyring-13.2.1
+++ b/metadata/md5-cache/dev-python/keyring-13.2.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-13.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cc85a0830da48b13b2db6aa90246eca9
+_md5_=48e530be74653ef95a9575ea5a34cdc6
diff --git a/metadata/md5-cache/dev-python/keyring-13.2.1-r1 b/metadata/md5-cache/dev-python/keyring-13.2.1-r1
index acd78b09b897..b737877c32ba 100644
--- a/metadata/md5-cache/dev-python/keyring-13.2.1-r1
+++ b/metadata/md5-cache/dev-python/keyring-13.2.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=PSF-2
 RDEPEND=dev-python/secretstorage[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/entrypoints[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-13.2.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=aa90e81b5a07af6226c3d832dd358a54
+_md5_=240cafbc708b4af591cca7d926405afe
diff --git a/metadata/md5-cache/dev-python/keyring-15.0.0 b/metadata/md5-cache/dev-python/keyring-15.0.0
index a8fb453d8cd6..8b8f1754075a 100644
--- a/metadata/md5-cache/dev-python/keyring-15.0.0
+++ b/metadata/md5-cache/dev-python/keyring-15.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=PSF-2
 RDEPEND=dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-15.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ffe9ca59e7ab76bb2adc2b12d1c1aa5e
+_md5_=f560e9a9d9ee4c50560bc1495410327d
diff --git a/metadata/md5-cache/dev-python/keyring-18.0.1 b/metadata/md5-cache/dev-python/keyring-18.0.1
index b276cc3c4d2e..b5c7b6092c49 100644
--- a/metadata/md5-cache/dev-python/keyring-18.0.1
+++ b/metadata/md5-cache/dev-python/keyring-18.0.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=PSF-2
 RDEPEND=dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-18.0.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0e180caa398004e643969fb77007684e
+_md5_=63b840d2ced3fe8560334047bbea834a
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-4.17.0 b/metadata/md5-cache/dev-python/keystonemiddleware-4.17.0
index 523aa2abbac2..d0a270b50e2f 100644
--- a/metadata/md5-cache/dev-python/keystonemiddleware-4.17.0
+++ b/metadata/md5-cache/dev-python/keystonemiddleware-4.17.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/keystoneauth-2.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/positional-1.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-4.17.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=187cff927eb3d99a4c9e42c5bc21754b
+_md5_=4ab4e440cc359338d3e41c8460987bfb
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-4.21.0 b/metadata/md5-cache/dev-python/keystonemiddleware-4.21.0
index 19436916898a..427b200ef892 100644
--- a/metadata/md5-cache/dev-python/keystonemiddleware-4.21.0
+++ b/metadata/md5-cache/dev-python/keystonemiddleware-4.21.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-4.21.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86fe30af121c6c353c96fa92777bafce
+_md5_=4dccbaf41c9c7c0be7493094ae827836
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-6.0.0 b/metadata/md5-cache/dev-python/keystonemiddleware-6.0.0
index 134a869180ea..391b65503de8 100644
--- a/metadata/md5-cache/dev-python/keystonemiddleware-6.0.0
+++ b/metadata/md5-cache/dev-python/keystonemiddleware-6.0.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-6.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=954d5c26f31ee1bd6386ca47441ecd1b
+_md5_=b052895e9547230160ddfe905fe4c9ec
diff --git a/metadata/md5-cache/dev-python/kid-0.9.6-r1 b/metadata/md5-cache/dev-python/kid-0.9.6-r1
index efd86f5f180f..f451c40b2b2a 100644
--- a/metadata/md5-cache/dev-python/kid-0.9.6-r1
+++ b/metadata/md5-cache/dev-python/kid-0.9.6-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ia64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.kid-templating.org/dist/0.9.6/kid-0.9.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=301b6cac5f4387f4362ce0127c0dc9ea
+_md5_=05f4297602b328adfdd97d780310dc58
diff --git a/metadata/md5-cache/dev-python/kombu-4.1.0-r1 b/metadata/md5-cache/dev-python/kombu-4.1.0-r1
index 51d0ddb75565..14c0aaf84e68 100644
--- a/metadata/md5-cache/dev-python/kombu-4.1.0-r1
+++ b/metadata/md5-cache/dev-python/kombu-4.1.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/py-amqp-2.1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/py-amqp-3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyro:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqs? ( >=dev-python/boto3-1.4.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) msgpack? ( >=dev-python/msgpack-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongodb? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) redis? ( >=dev-python/redis-py-2.10.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) yaml? ( >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-4.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c40f2d52437865df52a519a10d54f191
+_md5_=1d8a87a86ce192a10ab47ec7e0043b23
diff --git a/metadata/md5-cache/dev-python/kombu-4.2.1 b/metadata/md5-cache/dev-python/kombu-4.2.1
index 786c22d4193f..80fd7ba7e885 100644
--- a/metadata/md5-cache/dev-python/kombu-4.2.1
+++ b/metadata/md5-cache/dev-python/kombu-4.2.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/py-amqp-2.1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/py-amqp-3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyro:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqs? ( >=dev-python/boto3-1.4.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) msgpack? ( >=dev-python/msgpack-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongodb? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) redis? ( >=dev-python/redis-py-2.10.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) yaml? ( >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-4.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eff36babeee028b4baee057103de020d
+_md5_=2a15b9306ccd10565a8c3663d6110b63
diff --git a/metadata/md5-cache/dev-python/kombu-4.4.0 b/metadata/md5-cache/dev-python/kombu-4.4.0
index 79f041647bde..f63b22e68c6a 100644
--- a/metadata/md5-cache/dev-python/kombu-4.4.0
+++ b/metadata/md5-cache/dev-python/kombu-4.4.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/py-amqp-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/py-amqp-3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyro:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqs? ( >=dev-python/boto3-1.4.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) msgpack? ( >=dev-python/msgpack-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mongodb? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) redis? ( >=dev-python/redis-py-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) yaml? ( >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-4.4.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cc819eef09aa6f4a24a79a97137b3837
+_md5_=d5cccb352169c8b099449dbaeeb247ef
diff --git a/metadata/md5-cache/dev-python/kombu-4.6.3 b/metadata/md5-cache/dev-python/kombu-4.6.3
index ae48d3563b11..7ec76da9e461 100644
--- a/metadata/md5-cache/dev-python/kombu-4.6.3
+++ b/metadata/md5-cache/dev-python/kombu-4.6.3
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/py-amqp-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/py-amqp-3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyro-4.76:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqs? ( >=dev-python/boto3-1.4.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) msgpack? ( >=dev-python/msgpack-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mongodb? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) redis? ( >=dev-python/redis-py-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) yaml? ( >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-4.6.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f7a95458f3fb03e0e3969be4a380ffae
+_md5_=9e6c52abec5a8531f59cc7192bea0e4c
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.9j b/metadata/md5-cache/dev-python/lesscpy-0.9j
index d2397e8c977f..572fd604a4a3 100644
--- a/metadata/md5-cache/dev-python/lesscpy-0.9j
+++ b/metadata/md5-cache/dev-python/lesscpy-0.9j
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/ply[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lesscpy/lesscpy-0.9j.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=314caca486a3acf0e410bcf3f08c6129
+_md5_=b6089ec73af9855a60eec186cd6346e7
diff --git a/metadata/md5-cache/dev-python/libcloud-0.15.1 b/metadata/md5-cache/dev-python/libcloud-0.15.1
index 052bd4111bee..f96283dfa19b 100644
--- a/metadata/md5-cache/dev-python/libcloud-0.15.1
+++ b/metadata/md5-cache/dev-python/libcloud-0.15.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/libcloud/apache-libcloud-0.15.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fcebbd984734f58a4d41d9fa961ff05c
+_md5_=48efde11c3de8089a61170783d92a7da
diff --git a/metadata/md5-cache/dev-python/libcloud-1.2.1 b/metadata/md5-cache/dev-python/libcloud-1.2.1
index e5883a00563a..9f7c965fc50d 100644
--- a/metadata/md5-cache/dev-python/libcloud-1.2.1
+++ b/metadata/md5-cache/dev-python/libcloud-1.2.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/libcloud/apache-libcloud-1.2.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f3f1d87e420837980b10a07b137fda4
+_md5_=0fe74f667dfca068425a375b3dc895b4
diff --git a/metadata/md5-cache/dev-python/libpillowfight-0.2.4 b/metadata/md5-cache/dev-python/libpillowfight-0.2.4
index 04805a79ea79..9c012492089f 100644
--- a/metadata/md5-cache/dev-python/libpillowfight-0.2.4
+++ b/metadata/md5-cache/dev-python/libpillowfight-0.2.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypillowfight/pypillowfight-0.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f077410077c641ad0b182242766a01d4
+_md5_=66b3d8a4de9fe1b1a9e5646629ef9402
diff --git a/metadata/md5-cache/dev-python/libpillowfight-0.3.0 b/metadata/md5-cache/dev-python/libpillowfight-0.3.0
index 4fedcf1905a9..0ce0c493d22a 100644
--- a/metadata/md5-cache/dev-python/libpillowfight-0.3.0
+++ b/metadata/md5-cache/dev-python/libpillowfight-0.3.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypillowfight/pypillowfight-0.3.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6b9e3bdfbb578aba3648b2577282cb0e
+_md5_=55af35741d3aed8fcdc3bbc859da05a5
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.2.0 b/metadata/md5-cache/dev-python/libvirt-python-5.2.0
index 481eb9706829..5c63e025499e 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-5.2.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-5.2.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=app-emulation/libvirt:0/5.2.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-5.2.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=775042d0f29b0f8a1074699ec4d11e65
+_md5_=04ff7659f3d6eab8de571062e2d10426
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.5.0 b/metadata/md5-cache/dev-python/libvirt-python-5.5.0
index 8ab702420b21..64dbda14324d 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-5.5.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-5.5.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=app-emulation/libvirt:0/5.5.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-5.5.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=775042d0f29b0f8a1074699ec4d11e65
+_md5_=04ff7659f3d6eab8de571062e2d10426
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.6.0 b/metadata/md5-cache/dev-python/libvirt-python-5.6.0
index 7969440e5133..4bb22aa00433 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-5.6.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-5.6.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-2
 RDEPEND=app-emulation/libvirt:0/5.6.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-5.6.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3c15d8b7a5ead0ea8f1ca82df46e2e8c
+_md5_=c237c06615eb358028c0a9f0a7551ef2
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.8.0 b/metadata/md5-cache/dev-python/libvirt-python-5.8.0
index 9eb8aabf7974..9c6e969dab62 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-5.8.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-5.8.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-2
 RDEPEND=app-emulation/libvirt:0/5.8.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-5.8.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3c15d8b7a5ead0ea8f1ca82df46e2e8c
+_md5_=c237c06615eb358028c0a9f0a7551ef2
diff --git a/metadata/md5-cache/dev-python/libvirt-python-9999 b/metadata/md5-cache/dev-python/libvirt-python-9999
index 8543ebeb892f..950e2a28ca5c 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-9999
+++ b/metadata/md5-cache/dev-python/libvirt-python-9999
@@ -9,6 +9,7 @@ LICENSE=LGPL-2
 PROPERTIES=live
 RDEPEND=app-emulation/libvirt:=[-python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3c15d8b7a5ead0ea8f1ca82df46e2e8c
+_md5_=c237c06615eb358028c0a9f0a7551ef2
diff --git a/metadata/md5-cache/dev-python/line_profiler-2.0 b/metadata/md5-cache/dev-python/line_profiler-2.0
index ed589e1728bc..19775083c9be 100644
--- a/metadata/md5-cache/dev-python/line_profiler-2.0
+++ b/metadata/md5-cache/dev-python/line_profiler-2.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/ipython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/line_profiler/line_profiler-2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d679afefbfa4d06707cf1e8f9dc844a6
+_md5_=6f54322398212189252a3a779ffed9fc
diff --git a/metadata/md5-cache/dev-python/line_profiler-2.1.2 b/metadata/md5-cache/dev-python/line_profiler-2.1.2
index f46e275bf5c8..da33b7c9c715 100644
--- a/metadata/md5-cache/dev-python/line_profiler-2.1.2
+++ b/metadata/md5-cache/dev-python/line_profiler-2.1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/ipython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/line_profiler/line_profiler-2.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa60dc31c7891d9d406528695cef341c
+_md5_=3b93beb18fa39ca72d51f67cb39ef8df
diff --git a/metadata/md5-cache/dev-python/line_profiler-9999 b/metadata/md5-cache/dev-python/line_profiler-9999
index 9a5100ce27a7..037e7c6b6bdc 100644
--- a/metadata/md5-cache/dev-python/line_profiler-9999
+++ b/metadata/md5-cache/dev-python/line_profiler-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd1680bb38a3577d0facb8263033a59b
+_md5_=010e54b0d2c38235546dec66d396b3d4
diff --git a/metadata/md5-cache/dev-python/linecache2-1.0.0 b/metadata/md5-cache/dev-python/linecache2-1.0.0
index 4b14f9b80713..a65b22896199 100644
--- a/metadata/md5-cache/dev-python/linecache2-1.0.0
+++ b/metadata/md5-cache/dev-python/linecache2-1.0.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/linecache2/linecache2-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea26e0f3e2bfbd4d11a36d168cfb1058
+_md5_=9051b99fd49b44b8f600b1988d022dd2
diff --git a/metadata/md5-cache/dev-python/livereload-2.4.1 b/metadata/md5-cache/dev-python/livereload-2.4.1
index 62ceca7315ef..6dc90775a17b 100644
--- a/metadata/md5-cache/dev-python/livereload-2.4.1
+++ b/metadata/md5-cache/dev-python/livereload-2.4.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lepture/python-livereload/archive/v2.4.1.tar.gz -> livereload-2.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8acf364ee52501c7736f19586bb53805
+_md5_=d37b8e939a98064964885dcd6fa20298
diff --git a/metadata/md5-cache/dev-python/livereload-2.5.2 b/metadata/md5-cache/dev-python/livereload-2.5.2
index 9ecb12b9a1a1..5642a19211a5 100644
--- a/metadata/md5-cache/dev-python/livereload-2.5.2
+++ b/metadata/md5-cache/dev-python/livereload-2.5.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lepture/python-livereload/archive/v2.5.2.tar.gz -> livereload-2.5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=037122d2783b3ab84037afb361869541
+_md5_=ced44f211b7c28c24c71455071d8b256
diff --git a/metadata/md5-cache/dev-python/llfuse-1.3.2 b/metadata/md5-cache/dev-python/llfuse-1.3.2
index 087a1e69ed46..eb6ee83cd172 100644
--- a/metadata/md5-cache/dev-python/llfuse-1.3.2
+++ b/metadata/md5-cache/dev-python/llfuse-1.3.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=>=sys-fs/fuse-2.8.0:0 python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/llfuse/llfuse-1.3.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=240a2f1345f3202c17a97ed5ba4dfe4b
+_md5_=a6f34c6bdf74312e4d49af9ea1539547
diff --git a/metadata/md5-cache/dev-python/llfuse-1.3.4 b/metadata/md5-cache/dev-python/llfuse-1.3.4
index fe97562f2f68..0ef5f185412d 100644
--- a/metadata/md5-cache/dev-python/llfuse-1.3.4
+++ b/metadata/md5-cache/dev-python/llfuse-1.3.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=>=sys-fs/fuse-2.8.0:0 python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/llfuse/llfuse-1.3.4.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7f871cd14c1972c3f2cf964aaefbe851
+_md5_=c01075d07158f7a62641a24c01991d1f
diff --git a/metadata/md5-cache/dev-python/llfuse-1.3.5 b/metadata/md5-cache/dev-python/llfuse-1.3.5
index 8682176e4390..60bea4b66a37 100644
--- a/metadata/md5-cache/dev-python/llfuse-1.3.5
+++ b/metadata/md5-cache/dev-python/llfuse-1.3.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=>=sys-fs/fuse-2.8.0:0 python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/llfuse/llfuse-1.3.5.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d3df424a64d487d57004531559fa543
+_md5_=b48db3196ff2fbfc81ff774287085927
diff --git a/metadata/md5-cache/dev-python/lockfile-0.11.0-r1 b/metadata/md5-cache/dev-python/lockfile-0.11.0-r1
index 2b45fc6f17d7..2c6f8e99bddf 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.11.0-r1
+++ b/metadata/md5-cache/dev-python/lockfile-0.11.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lockfile/lockfile-0.11.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c883200ac37910ac6c1d51e792b5e57d
+_md5_=5a9ad5f04a34b001686417e336992ee9
diff --git a/metadata/md5-cache/dev-python/lockfile-0.12.2-r1 b/metadata/md5-cache/dev-python/lockfile-0.12.2-r1
index b071f49b6831..3117ced5c0dc 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.12.2-r1
+++ b/metadata/md5-cache/dev-python/lockfile-0.12.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lockfile/lockfile-0.12.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15bb440bd988d40eb9b05b6b7163b167
+_md5_=cbe15fd30731bec02aea56f81498bcae
diff --git a/metadata/md5-cache/dev-python/lockfile-0.12.2-r2 b/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
index 91b2dfc9a50f..2a7cca6c089d 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
+++ b/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lockfile/lockfile-0.12.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2d595b11af9c4fac28342bf63ec6d1ff
+_md5_=b4a5ca9e572703c4482d9dc1a11ecf5b
diff --git a/metadata/md5-cache/dev-python/locustio-0.7.3-r1 b/metadata/md5-cache/dev-python/locustio-0.7.3-r1
index 23988fe07047..9c6df3851c63 100644
--- a/metadata/md5-cache/dev-python/locustio-0.7.3-r1
+++ b/metadata/md5-cache/dev-python/locustio-0.7.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-python/gevent-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.4.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/locustio/locustio-0.7.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57823f24bf1cc9ba2b19fa7b00369b84
+_md5_=486478306b8fa4ef81b4858f29808f94
diff --git a/metadata/md5-cache/dev-python/logbook-0.9.1 b/metadata/md5-cache/dev-python/logbook-0.9.1
index 5b49c4d8b9ef..afaa2156cfbf 100644
--- a/metadata/md5-cache/dev-python/logbook-0.9.1
+++ b/metadata/md5-cache/dev-python/logbook-0.9.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/redis-py[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getlogbook/logbook/archive/0.9.1.tar.gz -> logbook-0.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d46e81eb33d6d0a5acec223749bb505d
+_md5_=52fcbaf663bacde27912f7b49e62c53e
diff --git a/metadata/md5-cache/dev-python/logbook-1.1.0 b/metadata/md5-cache/dev-python/logbook-1.1.0
index 1970c3d92b83..e0e295e4ac68 100644
--- a/metadata/md5-cache/dev-python/logbook-1.1.0
+++ b/metadata/md5-cache/dev-python/logbook-1.1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/redis-py[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getlogbook/logbook/archive/1.1.0.tar.gz -> logbook-1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29c0a91f07b3837a91489a8b5b01165e
+_md5_=a04cc3d3c8dc7ad8c92f1cea87ab4ab5
diff --git a/metadata/md5-cache/dev-python/logbook-1.4.0 b/metadata/md5-cache/dev-python/logbook-1.4.0
index 6dc72a986ea3..bc309019d3b9 100644
--- a/metadata/md5-cache/dev-python/logbook-1.4.0
+++ b/metadata/md5-cache/dev-python/logbook-1.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/redis-py[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getlogbook/logbook/archive/1.4.0.tar.gz -> logbook-1.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eee69fa56781f10dbab74c7a9a0b25fa
+_md5_=e1eaa1d387163bfc0220772c6231e425
diff --git a/metadata/md5-cache/dev-python/loguru-0.3.2 b/metadata/md5-cache/dev-python/loguru-0.3.2
index 50ea12507252..59b32f189a8b 100644
--- a/metadata/md5-cache/dev-python/loguru-0.3.2
+++ b/metadata/md5-cache/dev-python/loguru-0.3.2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/colorama-0.3.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Delgan/loguru/archive/0.3.2.tar.gz -> loguru-0.3.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d00bb84c39c94cf12220cb3b496145a3
+_md5_=8dcc9d0ae8ebee0a6f03300c7b37aa0c
diff --git a/metadata/md5-cache/dev-python/louie-1.1-r1 b/metadata/md5-cache/dev-python/louie-1.1-r1
index f6be2e73663a..3c6c587f0c4b 100644
--- a/metadata/md5-cache/dev-python/louie-1.1-r1
+++ b/metadata/md5-cache/dev-python/louie-1.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/L/Louie/Louie-1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df705e4667ee937bf0e4f92c20432170
+_md5_=7a0d418e7eb8f13753bfc88b8cb9ef3d
diff --git a/metadata/md5-cache/dev-python/lz4-0.10.1 b/metadata/md5-cache/dev-python/lz4-0.10.1
index 779a0debbb2a..73c302c82140 100644
--- a/metadata/md5-cache/dev-python/lz4-0.10.1
+++ b/metadata/md5-cache/dev-python/lz4-0.10.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-0.10.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3bcc2bba808ac9f4f2b37613dddf3007
+_md5_=9d08afe1b2f8d59eb10e80f44f0816ea
diff --git a/metadata/md5-cache/dev-python/lz4-0.8.2 b/metadata/md5-cache/dev-python/lz4-0.8.2
index 9a3cf7eb4817..ef496a803e70 100644
--- a/metadata/md5-cache/dev-python/lz4-0.8.2
+++ b/metadata/md5-cache/dev-python/lz4-0.8.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-0.8.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ebf42e7bb9acd94790799df7d7beed84
+_md5_=9916bad7a81a35c1ae4143226f498009
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.12 b/metadata/md5-cache/dev-python/m2r-0.1.12
index 845986d8b56f..22f358dc897e 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.12
+++ b/metadata/md5-cache/dev-python/m2r-0.1.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82fbab494c39a126a6c420288832c627
+_md5_=c757acc2ba77b33dd5f86ce8125ddeb2
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.14 b/metadata/md5-cache/dev-python/m2r-0.1.14
index c33d4e1be7ee..d21d90ed8b7f 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.14
+++ b/metadata/md5-cache/dev-python/m2r-0.1.14
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=MIT
 RDEPEND=dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0774192be3974a5b527048360b5a0f4c
+_md5_=6333243b77fdfa2b426501361106a731
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.5 b/metadata/md5-cache/dev-python/m2r-0.1.5
index 60ecc059fd15..a9f2b020b1db 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.5
+++ b/metadata/md5-cache/dev-python/m2r-0.1.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d7c63aaa5f1ac52d10dcdc9abb701de
+_md5_=ea69e09f65ba4b95f3781cf00d735e72
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.6 b/metadata/md5-cache/dev-python/m2r-0.1.6
index fdc755fe4fa5..e79c108ad811 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.6
+++ b/metadata/md5-cache/dev-python/m2r-0.1.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae077c7830e0dc093eb17294cde7ff18
+_md5_=940d21a10ab6e572e12e14f88c13c579
diff --git a/metadata/md5-cache/dev-python/mako-1.0.3 b/metadata/md5-cache/dev-python/mako-1.0.3
index fdb9de56f5e2..c8dba331eb40 100644
--- a/metadata/md5-cache/dev-python/mako-1.0.3
+++ b/metadata/md5-cache/dev-python/mako-1.0.3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/markupsafe-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ece838648639b2f52b9226548d481d64
+_md5_=cc14ebcf77185a6630350a7b96aca8f5
diff --git a/metadata/md5-cache/dev-python/mako-1.0.6 b/metadata/md5-cache/dev-python/mako-1.0.6
index 4090b0256dbe..7a5a5afe26cc 100644
--- a/metadata/md5-cache/dev-python/mako-1.0.6
+++ b/metadata/md5-cache/dev-python/mako-1.0.6
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=MIT
 RDEPEND=>=dev-python/markupsafe-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb4d4e1477b711a9ccc704149b87ce05
+_md5_=b175c62b2fd96fe6dd11fc23cf9564c0
diff --git a/metadata/md5-cache/dev-python/mako-1.0.7 b/metadata/md5-cache/dev-python/mako-1.0.7
index 9a71c337ccc6..3c19bc5b39df 100644
--- a/metadata/md5-cache/dev-python/mako-1.0.7
+++ b/metadata/md5-cache/dev-python/mako-1.0.7
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~
 LICENSE=MIT
 RDEPEND=>=dev-python/markupsafe-0.9.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.0.7.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c42a4a77be3baa13cd168ad786e66130
+_md5_=bd15a48c35165710272a798a93c26767
diff --git a/metadata/md5-cache/dev-python/mamba-0.8.6 b/metadata/md5-cache/dev-python/mamba-0.8.6
index c7c371b11793..dc49fca7263f 100644
--- a/metadata/md5-cache/dev-python/mamba-0.8.6
+++ b/metadata/md5-cache/dev-python/mamba-0.8.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/clint-0.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-3.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/watchdog-0.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mamba/mamba-0.8.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=caf99e7e8bc0984ad1d9a9b51c71e8d8
+_md5_=82e7c43ed55780b1b85485ff0b91043d
diff --git a/metadata/md5-cache/dev-python/mando-0.3.2 b/metadata/md5-cache/dev-python/mando-0.3.2
index 10061d1dfd88..63005ca0ec67 100644
--- a/metadata/md5-cache/dev-python/mando-0.3.2
+++ b/metadata/md5-cache/dev-python/mando-0.3.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubik/mando/archive/v0.3.2.tar.gz -> mando-0.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38064e3da1fd7fc8ec16fb47e71efa9d
+_md5_=b4053dd0de1288c62a660991ffd83a36
diff --git a/metadata/md5-cache/dev-python/mantissa-0.8.4 b/metadata/md5-cache/dev-python/mantissa-0.8.4
index 7aa90d36a5fd..3237bcbc9b3a 100644
--- a/metadata/md5-cache/dev-python/mantissa-0.8.4
+++ b/metadata/md5-cache/dev-python/mantissa-0.8.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/axiom-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cssutils-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/nevow-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2012j[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-14.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-mail-14.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-conch-14.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/vertex-0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mantissa/Mantissa-0.8.4.tar.gz -> mantissa-0.8.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae8ce10d2f92e6fa2232878594d7bda1
+_md5_=9e48857438c9b3c96f69e5ff89154b62
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.11 b/metadata/md5-cache/dev-python/markdown-2.6.11
index dc8cbd31df5c..8071e975bd7a 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.11
+++ b/metadata/md5-cache/dev-python/markdown-2.6.11
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~am
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=pygments? ( dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.11.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=10328e62bf967c8abf0d9742cc604fc0
+_md5_=e0d08256c9df325731dffc7d36159626
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.5 b/metadata/md5-cache/dev-python/markdown-2.6.5
index a598adb9e8cc..b75b86c9e503 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.5
+++ b/metadata/md5-cache/dev-python/markdown-2.6.5
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=pygments? ( dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a2361aff83a9ede50abb213321b8f19
+_md5_=f590d52914acdfffc080b41adf76e225
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.8 b/metadata/md5-cache/dev-python/markdown-2.6.8
index fd175a1ba134..f99cb9ee7c45 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.8
+++ b/metadata/md5-cache/dev-python/markdown-2.6.8
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=pygments? ( dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c3164419f06eb41f0176c1789c479df
+_md5_=36af9ce46683e94ab30ca359d143bf45
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.9 b/metadata/md5-cache/dev-python/markdown-2.6.9
index e8d19f346a83..c117da483d73 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.9
+++ b/metadata/md5-cache/dev-python/markdown-2.6.9
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~am
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=pygments? ( dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4cceb2b34ef879d1b312b568f28b792
+_md5_=484d52917a768357e2ce0b0974ff7a46
diff --git a/metadata/md5-cache/dev-python/markdown-3.0.1 b/metadata/md5-cache/dev-python/markdown-3.0.1
index 7df07143f164..31137def03cf 100644
--- a/metadata/md5-cache/dev-python/markdown-3.0.1
+++ b/metadata/md5-cache/dev-python/markdown-3.0.1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd6
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=pygments? ( dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-3.0.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a10c69ef3596582ab1eb94b275f2a4ac
+_md5_=cf0a53f522805b9380d407f69aec56d9
diff --git a/metadata/md5-cache/dev-python/markups-3.0.0 b/metadata/md5-cache/dev-python/markups-3.0.0
index a60cdcf157f9..e6b515a828c8 100644
--- a/metadata/md5-cache/dev-python/markups-3.0.0
+++ b/metadata/md5-cache/dev-python/markups-3.0.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/markdown[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-markdown-math[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markups/Markups-3.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c199db42bdb4b62440207d064a2df375
+_md5_=da85f588a0f49f9ee6b8cd13923e38da
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1 b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
index abedd6d066ff..87026d38cf71 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49cc21d586bb26c60b66daa745121448
+_md5_=f834dcfeb678f0bdc40f2c9c20703416
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.4 b/metadata/md5-cache/dev-python/matplotlib-2.2.4
index 5d9fd41db2f1..5dd463702680 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.4
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93200491416bfaf18dfb57136db74697
+_md5_=92dd6445c0994e85514db13fad95565e
diff --git a/metadata/md5-cache/dev-python/mccabe-0.6.1 b/metadata/md5-cache/dev-python/mccabe-0.6.1
index d37206a6847e..aa9d273a4968 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.6.1
+++ b/metadata/md5-cache/dev-python/mccabe-0.6.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-
 LICENSE=MIT
 RDEPEND=dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-0.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3c1e27465b9e76737ddba6145d1a0a4
+_md5_=b4f2ecd66e7e73e7d9f57a3e5a448b26
diff --git a/metadata/md5-cache/dev-python/memory_profiler-0.47 b/metadata/md5-cache/dev-python/memory_profiler-0.47
index a97e13252088..90108cf71151 100644
--- a/metadata/md5-cache/dev-python/memory_profiler-0.47
+++ b/metadata/md5-cache/dev-python/memory_profiler-0.47
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/memory_profiler/memory_profiler-0.47.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4b93049c2d5c1c66c42d5741421db48
+_md5_=6684ff4c61536ea93f730ef90614b56f
diff --git a/metadata/md5-cache/dev-python/metakernel-0.20.4 b/metadata/md5-cache/dev-python/metakernel-0.20.4
index 35bfe23bddd7..e03e3199f48e 100644
--- a/metadata/md5-cache/dev-python/metakernel-0.20.4
+++ b/metadata/md5-cache/dev-python/metakernel-0.20.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/ipykernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/metakernel/metakernel-0.20.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5232f89f378a428762627aec8f5f86b3
+_md5_=ca720a9f88e7e65ec5d2319d6616295a
diff --git a/metadata/md5-cache/dev-python/meteor-ejson-1.1.0 b/metadata/md5-cache/dev-python/meteor-ejson-1.1.0
index 53eab04070c1..27cca22c2d19 100644
--- a/metadata/md5-cache/dev-python/meteor-ejson-1.1.0
+++ b/metadata/md5-cache/dev-python/meteor-ejson-1.1.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meteor-ejson/meteor-ejson-1.1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=768a2061ae68873fa6bc4b87b36ccd5e
+_md5_=f5de0372e713bd9312053897aa5753e1
diff --git a/metadata/md5-cache/dev-python/milk-0.5.1 b/metadata/md5-cache/dev-python/milk-0.5.1
index 55cbbcec7529..063484bb26c0 100644
--- a/metadata/md5-cache/dev-python/milk-0.5.1
+++ b/metadata/md5-cache/dev-python/milk-0.5.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/numpy python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/milk/milk-0.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33fb06b735f4eeb3bf4c0f2a3791d1b7
+_md5_=b2f099e93d59938485938789720eb724
diff --git a/metadata/md5-cache/dev-python/milk-0.5.3 b/metadata/md5-cache/dev-python/milk-0.5.3
index e48e02435470..e48c908ed442 100644
--- a/metadata/md5-cache/dev-python/milk-0.5.3
+++ b/metadata/md5-cache/dev-python/milk-0.5.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/milk/milk-0.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c30e7da36851451177f8a0b7c0d62b02
+_md5_=bdabdfc756486aa5808f2dea709743c8
diff --git a/metadata/md5-cache/dev-python/milk-0.6.1 b/metadata/md5-cache/dev-python/milk-0.6.1
index 3273a9968869..18b778f6b81e 100644
--- a/metadata/md5-cache/dev-python/milk-0.6.1
+++ b/metadata/md5-cache/dev-python/milk-0.6.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/milk/milk-0.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c30e7da36851451177f8a0b7c0d62b02
+_md5_=bdabdfc756486aa5808f2dea709743c8
diff --git a/metadata/md5-cache/dev-python/minidb-2.0.2 b/metadata/md5-cache/dev-python/minidb-2.0.2
index 3196f9d6c3cb..d1caffa8f5c1 100644
--- a/metadata/md5-cache/dev-python/minidb-2.0.2
+++ b/metadata/md5-cache/dev-python/minidb-2.0.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/minidb/minidb-2.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ecaaee319864797047296ff63c1d171d
+_md5_=8a30adf9349823d277162906769c3b36
diff --git a/metadata/md5-cache/dev-python/minidb-2.0.2-r1 b/metadata/md5-cache/dev-python/minidb-2.0.2-r1
index c9aa65d67d49..0047dfa93da5 100644
--- a/metadata/md5-cache/dev-python/minidb-2.0.2-r1
+++ b/metadata/md5-cache/dev-python/minidb-2.0.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 ~x86
 LICENSE=ISC
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/minidb/minidb-2.0.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=29775210ac2e9905221ce3bd9d940050
+_md5_=4c2f6711754756437f3afa9b24a1ea86
diff --git a/metadata/md5-cache/dev-python/mistune-0.8.3 b/metadata/md5-cache/dev-python/mistune-0.8.3
index 691b0f4b8060..4f2e095c44dd 100644
--- a/metadata/md5-cache/dev-python/mistune-0.8.3
+++ b/metadata/md5-cache/dev-python/mistune-0.8.3
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mistune/mistune-0.8.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=471831bbfcd3ad9f993e920e78d01980
+_md5_=c50a1fb510e1a210e1f01faeb16e7ee8
diff --git a/metadata/md5-cache/dev-python/mkdocs-0.15.3 b/metadata/md5-cache/dev-python/mkdocs-0.15.3
index cd43410bf7c1..5929e0e0532a 100644
--- a/metadata/md5-cache/dev-python/mkdocs-0.15.3
+++ b/metadata/md5-cache/dev-python/mkdocs-0.15.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-3.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/livereload-2.3.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/markdown-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mkdocs-bootstrap-0.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mkdocs-bootswatch-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomchristie/mkdocs/archive/0.15.3.tar.gz -> mkdocs-0.15.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=469f19de9de516a49b9ba5a0b682d3c2
+_md5_=9155bcb33aa34f1c99346605fdf91872
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.0.1 b/metadata/md5-cache/dev-python/mkdocs-1.0.1
index b336a5b2aa0f..f97720e906d4 100644
--- a/metadata/md5-cache/dev-python/mkdocs-1.0.1
+++ b/metadata/md5-cache/dev-python/mkdocs-1.0.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-3.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/livereload-2.5.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/markdown-2.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mkdocs-bootstrap-0.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mkdocs-bootswatch-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomchristie/mkdocs/archive/1.0.1.tar.gz -> mkdocs-1.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aed1c1cd783b5385e24f4c3ddfa6f69c
+_md5_=ce8b6869ea4c1fff68280c2b13833493
diff --git a/metadata/md5-cache/dev-python/montage-wrapper-0.9.8 b/metadata/md5-cache/dev-python/montage-wrapper-0.9.8
index 4934e932d583..90791a07033c 100644
--- a/metadata/md5-cache/dev-python/montage-wrapper-0.9.8
+++ b/metadata/md5-cache/dev-python/montage-wrapper-0.9.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-astronomy/montage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/montage-wrapper/montage-wrapper-0.9.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=721348c9c869ebe41ec91863791c830e
+_md5_=b59ec87fae7e0691cd6fea20abd04941
diff --git a/metadata/md5-cache/dev-python/montage-wrapper-0.9.9 b/metadata/md5-cache/dev-python/montage-wrapper-0.9.9
index 976845d06c85..fd170b9883d1 100644
--- a/metadata/md5-cache/dev-python/montage-wrapper-0.9.9
+++ b/metadata/md5-cache/dev-python/montage-wrapper-0.9.9
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-astronomy/montage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/montage-wrapper/montage-wrapper-0.9.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=21a9887a099809f568b0b65f860b24ef
+_md5_=94867b18dcbf96f8d73d9ae8f091fbcd
diff --git a/metadata/md5-cache/dev-python/moto-1.0.1-r1 b/metadata/md5-cache/dev-python/moto-1.0.1-r1
index 7a8c433b9ca8..d41451a637fd 100644
--- a/metadata/md5-cache/dev-python/moto-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/moto-1.0.1-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/cookies[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/dicttoxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/boto-2.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/boto3-1.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pretty-yaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/xmltodict[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/werkzeug[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-1.0.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=161c32992a0820ad9824c20d9b458e24
+_md5_=172ebeefd1932a61a87f9f60ecb61f39
diff --git a/metadata/md5-cache/dev-python/moviepy-0.2.2 b/metadata/md5-cache/dev-python/moviepy-0.2.2
index 791339358b2e..8b210de63591 100644
--- a/metadata/md5-cache/dev-python/moviepy-0.2.2
+++ b/metadata/md5-cache/dev-python/moviepy-0.2.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imageio[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygame[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/tqdm[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/ffmpeg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Zulko/moviepy/archive/v0.2.2.tar.gz -> moviepy-0.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1587b5aa7f30466032053106d029707
+_md5_=a08a2359384c273e6c024ed8e82d65d8
diff --git a/metadata/md5-cache/dev-python/mox-0.5.3-r1 b/metadata/md5-cache/dev-python/mox-0.5.3-r1
index a61ff75a43d0..349afed82ce9 100644
--- a/metadata/md5-cache/dev-python/mox-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/mox-0.5.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=Apache-2.0
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mox/mox-0.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae531befd94da54e9d7c9dfef2eab9f9
+_md5_=a726397fc074213cd69ea1974680cb0d
diff --git a/metadata/md5-cache/dev-python/mox3-0.24.0 b/metadata/md5-cache/dev-python/mox3-0.24.0
index 7d75661f1cfd..3a38e3d0ad5e 100644
--- a/metadata/md5-cache/dev-python/mox3-0.24.0
+++ b/metadata/md5-cache/dev-python/mox3-0.24.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mox3/mox3-0.24.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9c78a986bc237056d472022bd923faa
+_md5_=f377fcc6bcf4b424809a3ac0d32c1ed6
diff --git a/metadata/md5-cache/dev-python/mpi4py-3.0.2 b/metadata/md5-cache/dev-python/mpi4py-3.0.2
index 6620306870e4..e29fdda90c54 100644
--- a/metadata/md5-cache/dev-python/mpi4py-3.0.2
+++ b/metadata/md5-cache/dev-python/mpi4py-3.0.2
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/mpi python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mpi4py/mpi4py-3.0.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=34243676def6af9b9899de4d8a3f3af6
+_md5_=81e9b173ff4ac305c8e2aeafb8fe463c
diff --git a/metadata/md5-cache/dev-python/mpmath-1.0.0 b/metadata/md5-cache/dev-python/mpmath-1.0.0
index a1dbf6151fdb..c2456e6913f4 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.0.0
+++ b/metadata/md5-cache/dev-python/mpmath-1.0.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x8
 LICENSE=BSD
 RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mpmath.org/files/mpmath-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd34ad9154141119275620775b52ece0
+_md5_=2c5a1e903d008d2dd770e288cc48c221
diff --git a/metadata/md5-cache/dev-python/mpmath-1.1.0 b/metadata/md5-cache/dev-python/mpmath-1.1.0
index 1e1dbcc407e4..ab9ff845195c 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.1.0
+++ b/metadata/md5-cache/dev-python/mpmath-1.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~
 LICENSE=BSD
 RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fredrik-johansson/mpmath/archive/1.1.0.tar.gz -> mpmath-1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c6e3d4b7a7f0e4b60ebea1c4c29aaf37
+_md5_=ec8801ef6502bf9147a7c5283f43506a
diff --git a/metadata/md5-cache/dev-python/msgpack-0.4.8 b/metadata/md5-cache/dev-python/msgpack-0.4.8
index 6a8961e9cdd1..f3420a0698ec 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.4.8
+++ b/metadata/md5-cache/dev-python/msgpack-0.4.8
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~arm64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack-python/msgpack-python-0.4.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e20543900a536af92acc86d897b75c54
+_md5_=7aaa545647f26b4e58d9ed242945fbe4
diff --git a/metadata/md5-cache/dev-python/msgpack-0.5.1 b/metadata/md5-cache/dev-python/msgpack-0.5.1
index f2810c99c6eb..030b5d42f941 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.5.1
+++ b/metadata/md5-cache/dev-python/msgpack-0.5.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~arm64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack-python/msgpack-python-0.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7162cb0a200d8ee3257316295f9e7e20
+_md5_=15d2df9546640ee7a53f1b4ccd512c0b
diff --git a/metadata/md5-cache/dev-python/msgpack-0.5.6 b/metadata/md5-cache/dev-python/msgpack-0.5.6
index f609017f746a..07943bb40f56 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.5.6
+++ b/metadata/md5-cache/dev-python/msgpack-0.5.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~arm64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack/msgpack-0.5.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd9791debc41efed31707ee6d63874db
+_md5_=2c1dbb405d431698e7f0863d9da705cc
diff --git a/metadata/md5-cache/dev-python/msgpack-0.6.1 b/metadata/md5-cache/dev-python/msgpack-0.6.1
index 1d38f22aef74..f8ec3add7a2c 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.6.1
+++ b/metadata/md5-cache/dev-python/msgpack-0.6.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~arm64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack/msgpack-0.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=58e65985740476e301f24f1fd4cb9da6
+_md5_=33530ab125881cd9caf854bba5a969be
diff --git a/metadata/md5-cache/dev-python/multidict-4.1.0 b/metadata/md5-cache/dev-python/multidict-4.1.0
index b0ba9cb11bd4..6875978d1a15 100644
--- a/metadata/md5-cache/dev-python/multidict-4.1.0
+++ b/metadata/md5-cache/dev-python/multidict-4.1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v4.1.0.tar.gz -> multidict-4.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3eb43b233db473a448fcfa213920dae3
+_md5_=91fbc758f95cae07f2326903a4678b59
diff --git a/metadata/md5-cache/dev-python/multidict-4.3.1 b/metadata/md5-cache/dev-python/multidict-4.3.1
index 040b8a577b4f..6976c46f72f5 100644
--- a/metadata/md5-cache/dev-python/multidict-4.3.1
+++ b/metadata/md5-cache/dev-python/multidict-4.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v4.3.1.tar.gz -> multidict-4.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f43af32a6a079d00835035cfbbb7146
+_md5_=ad932c3bdfa714c151912fb8bc5e8403
diff --git a/metadata/md5-cache/dev-python/multidict-4.5.2 b/metadata/md5-cache/dev-python/multidict-4.5.2
index 64e05f975fcf..972c5a020acb 100644
--- a/metadata/md5-cache/dev-python/multidict-4.5.2
+++ b/metadata/md5-cache/dev-python/multidict-4.5.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v4.5.2.tar.gz -> multidict-4.5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea1b8a4b5943bb30e2e1c2f550f6263a
+_md5_=a79a07a4625254be4ee89ef9306d2f21
diff --git a/metadata/md5-cache/dev-python/mygpoclient-1.8 b/metadata/md5-cache/dev-python/mygpoclient-1.8
index c42e158de4e6..4544bb9188f8 100644
--- a/metadata/md5-cache/dev-python/mygpoclient-1.8
+++ b/metadata/md5-cache/dev-python/mygpoclient-1.8
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/mygpoclient/archive/1.8.tar.gz -> mygpoclient-1.8.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=02dd5099324dce1ffd7b8248e6264762
+_md5_=ecb03d914dd195badf402277d181f3e0
diff --git a/metadata/md5-cache/dev-python/mypy_extensions-0.4.1 b/metadata/md5-cache/dev-python/mypy_extensions-0.4.1
index 9b590981d8c0..28b8e75270b1 100644
--- a/metadata/md5-cache/dev-python/mypy_extensions-0.4.1
+++ b/metadata/md5-cache/dev-python/mypy_extensions-0.4.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy_extensions/archive/0.4.1.tar.gz -> mypy_extensions-0.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0117c4ddd7a6dd120bedec1c3583e600
+_md5_=2255a165c252ed04faa06bbb380fb0bc
diff --git a/metadata/md5-cache/dev-python/naima-0.8-r1 b/metadata/md5-cache/dev-python/naima-0.8-r1
index 890800c340b6..100fe92ce13c 100644
--- a/metadata/md5-cache/dev-python/naima-0.8-r1
+++ b/metadata/md5-cache/dev-python/naima-0.8-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/corner[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/emcee[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/naima/naima-0.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb0e8b13f11d2bee43987dc8221665ea
+_md5_=0e614f2b8a8db91aed9ad0c5da2f7980
diff --git a/metadata/md5-cache/dev-python/nbdime-0.1.2 b/metadata/md5-cache/dev-python/nbdime-0.1.2
index 5b35d1d3329f..81b9a1084079 100644
--- a/metadata/md5-cache/dev-python/nbdime-0.1.2
+++ b/metadata/md5-cache/dev-python/nbdime-0.1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-python/nbformat[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/colorama[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] www-servers/tornado[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] webtools? ( net-libs/nodejs[npm] ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbdime/nbdime-0.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d57c0a8e96ff1bfeafe3a1ff97c094a8
+_md5_=c9af211385db252f0c86708bb350d6fe
diff --git a/metadata/md5-cache/dev-python/nbdime-0.2.0 b/metadata/md5-cache/dev-python/nbdime-0.2.0
index d9d348284f76..6bbb30d94814 100644
--- a/metadata/md5-cache/dev-python/nbdime-0.2.0
+++ b/metadata/md5-cache/dev-python/nbdime-0.2.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-python/nbformat[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/colorama[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] webtools? ( net-libs/nodejs[npm] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbdime/nbdime-0.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28d8e7cc03e5811bd380d9f0216ff2ae
+_md5_=a11d02a4563a7708603541ce628ed81a
diff --git a/metadata/md5-cache/dev-python/nbformat-4.4.0 b/metadata/md5-cache/dev-python/nbformat-4.4.0
index 3b23efc0072c..4613030fee09 100644
--- a/metadata/md5-cache/dev-python/nbformat-4.4.0
+++ b/metadata/md5-cache/dev-python/nbformat-4.4.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonschema-2.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbformat/nbformat-4.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=137afb102896aa35b562872bd98994fb
+_md5_=72eaa1053a6bd35bd62037b8e8abde59
diff --git a/metadata/md5-cache/dev-python/nbformat-4.4.0-r1 b/metadata/md5-cache/dev-python/nbformat-4.4.0-r1
index 1027cd5ca808..e83debd908d9 100644
--- a/metadata/md5-cache/dev-python/nbformat-4.4.0-r1
+++ b/metadata/md5-cache/dev-python/nbformat-4.4.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonschema-2.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbformat/nbformat-4.4.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9222ecd6f5ebd482c801ace9c36f6d46
+_md5_=4569b56f134438c503024f2ba1efc9de
diff --git a/metadata/md5-cache/dev-python/nbval-0.7 b/metadata/md5-cache/dev-python/nbval-0.7
index 9e509de0a148..2d8c0b7eca5c 100644
--- a/metadata/md5-cache/dev-python/nbval-0.7
+++ b/metadata/md5-cache/dev-python/nbval-0.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/pytest-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbval/nbval-0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9297780f826f1ca94617d58a3b8778c2
+_md5_=00b3918bfdaa407ed52bacc907bc0fc7
diff --git a/metadata/md5-cache/dev-python/nbval-0.9.1 b/metadata/md5-cache/dev-python/nbval-0.9.1
index cc140b31feee..8a330e024173 100644
--- a/metadata/md5-cache/dev-python/nbval-0.9.1
+++ b/metadata/md5-cache/dev-python/nbval-0.9.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbval/nbval-0.9.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4092463aadfad1e69152dfc4d1af41fe
+_md5_=e40d8d6aa4ba27a33cd49f2eaa9a0b4e
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1
index 8ab08e7c7d56..96ef9a4e2573 100644
--- a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1
+++ b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=dev-python/pyopenssl[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/ndg-httpsclient/ndg_httpsclient-0.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=682971965bacdb7e6493eeeb90caf987
+_md5_=b0261e3f17e95900751335c4b03b659a
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.19 b/metadata/md5-cache/dev-python/netaddr-0.7.19
index 478e8b54fd1d..adda8b6d5fe6 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.19
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.19
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=cli? ( python_targets_python3_5? ( >=dev-python/ipython-0.13.1-r1[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/ipython-0.13.1-r1[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/ipython-0.13.1-r1[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=cli? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/netaddr/netaddr-0.7.19.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09c43005721dda4caf946b6a2df3021a
+_md5_=eae0e74dadc0b66f916a4052c736aa29
diff --git a/metadata/md5-cache/dev-python/networkx-1.11 b/metadata/md5-cache/dev-python/networkx-1.11
index 63def237a035..b8ece3f2a657 100644
--- a/metadata/md5-cache/dev-python/networkx-1.11
+++ b/metadata/md5-cache/dev-python/networkx-1.11
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-1.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=258079edfa1875b71c9f81a57174e6a9
+_md5_=f87480e908430324e1a4dfa9b2d0a76a
diff --git a/metadata/md5-cache/dev-python/networkx-1.11-r1 b/metadata/md5-cache/dev-python/networkx-1.11-r1
index 650c2a43d06f..88d6c71fa176 100644
--- a/metadata/md5-cache/dev-python/networkx-1.11-r1
+++ b/metadata/md5-cache/dev-python/networkx-1.11-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-mac
 LICENSE=BSD
 RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] scipy? ( sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/pygraphviz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-1.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e691373fd7e5be2c0c130cbdc6a89076
+_md5_=9409110eeac4470ef14d72bbff8e06d0
diff --git a/metadata/md5-cache/dev-python/networkx-2.1 b/metadata/md5-cache/dev-python/networkx-2.1
index be012ee884dc..d48f7c6fab7b 100644
--- a/metadata/md5-cache/dev-python/networkx-2.1
+++ b/metadata/md5-cache/dev-python/networkx-2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-m
 LICENSE=BSD
 RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/matplotlib-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] extras? ( >=dev-python/pydot-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygraphviz-1.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/gdal-1.10.0[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pandas? ( >=dev-python/pandas-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) scipy? ( >=sci-libs/scipy-0.19[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xml? ( >=dev-python/lxml-3.7.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) yaml? ( >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) examples? ( dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=test? ( extras pandas scipy xml yaml ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.1.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=30ef6e33349bac86752737fdaa1c9124
+_md5_=9025dc84c4d477488439f7457057c9b4
diff --git a/metadata/md5-cache/dev-python/networkx-2.2 b/metadata/md5-cache/dev-python/networkx-2.2
index 5211f0e952a2..833f30fa367b 100644
--- a/metadata/md5-cache/dev-python/networkx-2.2
+++ b/metadata/md5-cache/dev-python/networkx-2.2
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-mac
 LICENSE=BSD
 RDEPEND=>=dev-python/decorator-4.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/matplotlib-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] extras? ( >=dev-python/pydot-1.2.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygraphviz-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-libs/gdal-1.10.0[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) pandas? ( >=dev-python/pandas-0.23.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) scipy? ( >=sci-libs/scipy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) xml? ( >=dev-python/lxml-4.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) examples? ( dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=test? ( extras pandas scipy xml yaml ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.2.zip
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=fcb6b45899f4672df97fe92f90a4b81a
+_md5_=e7a41543125de0b87645b7889fdf22f1
diff --git a/metadata/md5-cache/dev-python/networkx-2.4 b/metadata/md5-cache/dev-python/networkx-2.4
index 3b967dc64893..a68979b0a382 100644
--- a/metadata/md5-cache/dev-python/networkx-2.4
+++ b/metadata/md5-cache/dev-python/networkx-2.4
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-m
 LICENSE=BSD
 RDEPEND=>=dev-python/decorator-4.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/matplotlib-2.2.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] extras? ( >=dev-python/pydot-1.2.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygraphviz-1.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-libs/gdal-1.10.0[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) pandas? ( >=dev-python/pandas-0.23.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) scipy? ( >=sci-libs/scipy-1.1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) xml? ( >=dev-python/lxml-4.2.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) examples? ( dev-python/pyparsing[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=test? ( extras pandas scipy xml yaml ) || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=244648b6782f5bff919cfefed14adb3d
+_md5_=1f3c5853da3a892da35558f48bfb0275
diff --git a/metadata/md5-cache/dev-python/nevow-0.14.3 b/metadata/md5-cache/dev-python/nevow-0.14.3
index 5fb4825c2930..952d32ac7c13 100644
--- a/metadata/md5-cache/dev-python/nevow-0.14.3
+++ b/metadata/md5-cache/dev-python/nevow-0.14.3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux
 LICENSE=MIT
 RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ( dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/N/Nevow/Nevow-0.14.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7cb2fe158bbb2c0d60874643cd17bdaa
+_md5_=1aa97debab84250870a37c4251d55b8d
diff --git a/metadata/md5-cache/dev-python/node-semver-0.2.0 b/metadata/md5-cache/dev-python/node-semver-0.2.0
index db093d75f8b6..a1606ae04d09 100644
--- a/metadata/md5-cache/dev-python/node-semver-0.2.0
+++ b/metadata/md5-cache/dev-python/node-semver-0.2.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/node-semver/node-semver-0.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=827447952d837bf351b0f08cdd40a78e
+_md5_=8e2648e5e6cacce9b7db539aa06cb129
diff --git a/metadata/md5-cache/dev-python/node-semver-0.6.1 b/metadata/md5-cache/dev-python/node-semver-0.6.1
index 0aaeaeff3f9e..cf4320ddebaf 100644
--- a/metadata/md5-cache/dev-python/node-semver-0.6.1
+++ b/metadata/md5-cache/dev-python/node-semver-0.6.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/podhmo/python-semver/archive/0.6.1.tar.gz -> node-semver-0.6.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e84afa931be637eaaeea7d780331a2a7
+_md5_=87996b63358aac980e0dc53da11453e7
diff --git a/metadata/md5-cache/dev-python/node-semver-0.7.0 b/metadata/md5-cache/dev-python/node-semver-0.7.0
index 0bb647fd9e80..70788512ab2a 100644
--- a/metadata/md5-cache/dev-python/node-semver-0.7.0
+++ b/metadata/md5-cache/dev-python/node-semver-0.7.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/podhmo/python-semver/archive/0.7.0.tar.gz -> node-semver-0.7.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e84afa931be637eaaeea7d780331a2a7
+_md5_=87996b63358aac980e0dc53da11453e7
diff --git a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2 b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
index 917377f7dcbf..aa1c47ce6316 100644
--- a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
+++ b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 ~ppc x86
 LICENSE=MIT
 RDEPEND=dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose_warnings_filters/nose_warnings_filters-0.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=824bb361513e20e4b3ba5cbd6a16b00b
+_md5_=c7d5f13d8e88f8eceb33a5f3bcac627e
diff --git a/metadata/md5-cache/dev-python/notebook-5.0.0 b/metadata/md5-cache/dev-python/notebook-5.0.0
index 63a2cbd9e483..68e7108e5b72 100644
--- a/metadata/md5-cache/dev-python/notebook-5.0.0
+++ b/metadata/md5-cache/dev-python/notebook-5.0.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/terminado-0.3.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e77824072159dec6a99efb83119a86bf
+_md5_=eea162cd1bfbec5f64c15d407816f949
diff --git a/metadata/md5-cache/dev-python/notebook-5.2.1 b/metadata/md5-cache/dev-python/notebook-5.2.1
index 80757c16ed74..2d7b1cced82c 100644
--- a/metadata/md5-cache/dev-python/notebook-5.2.1
+++ b/metadata/md5-cache/dev-python/notebook-5.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/terminado-0.3.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython_genutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jupyter_core-4.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbformat[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipykernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d71fc545aad0346c608ca6eb9b5ce2c
+_md5_=83b465f7ddc25bccd88927f8e745c8f6
diff --git a/metadata/md5-cache/dev-python/notebook-5.7.0 b/metadata/md5-cache/dev-python/notebook-5.7.0
index 7e9ea380a46b..cb50898cc926 100644
--- a/metadata/md5-cache/dev-python/notebook-5.7.0
+++ b/metadata/md5-cache/dev-python/notebook-5.7.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/terminado-0.8.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_core-4.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-17[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/send2trash[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/prometheus_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cbfc41ae905469b448492a26029e85fd
+_md5_=bd9ab022b6c01975c6c6f0fa06d4e96e
diff --git a/metadata/md5-cache/dev-python/notebook-5.7.8 b/metadata/md5-cache/dev-python/notebook-5.7.8
index 2ea521f8d33b..965cfa08a8e2 100644
--- a/metadata/md5-cache/dev-python/notebook-5.7.8
+++ b/metadata/md5-cache/dev-python/notebook-5.7.8
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/terminado-0.8.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_core-4.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-17[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_client-5.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/send2trash[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/prometheus_client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.7.8.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=21dac32eae9dfc107b2973561761d67d
+_md5_=3523f6cf63b9ee9b1bcf313ab1cf82d1
diff --git a/metadata/md5-cache/dev-python/numba-0.27.0 b/metadata/md5-cache/dev-python/numba-0.27.0
index 6734e0e2d398..6bc662ac2dd3 100644
--- a/metadata/md5-cache/dev-python/numba-0.27.0
+++ b/metadata/md5-cache/dev-python/numba-0.27.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/llvmlite-0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/numba/numba/archive/0.27.0.tar.gz -> numba-0.27.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3395c0509ebb8b0b293ee372cfbc7d7
+_md5_=ad97389aab00bb5cfcb57b33013ee07b
diff --git a/metadata/md5-cache/dev-python/numba-0.35.0 b/metadata/md5-cache/dev-python/numba-0.35.0
index a0f88aff0123..3edd87e4338d 100644
--- a/metadata/md5-cache/dev-python/numba-0.35.0
+++ b/metadata/md5-cache/dev-python/numba-0.35.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/llvmlite-0.19[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/numba/numba/archive/0.35.0.tar.gz -> numba-0.35.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=10e597cbf0216c0e4c5b9cde6931e756
+_md5_=012a54b9d24e12b29b2f46058f88d3f0
diff --git a/metadata/md5-cache/dev-python/numba-0.37.0 b/metadata/md5-cache/dev-python/numba-0.37.0
index f5f755029e82..accc18dc083a 100644
--- a/metadata/md5-cache/dev-python/numba-0.37.0
+++ b/metadata/md5-cache/dev-python/numba-0.37.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/llvmlite-0.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/numba/numba/archive/0.37.0.tar.gz -> numba-0.37.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a042d8615dc40ef9f649fe785eb57586
+_md5_=0f2a6db358c2acdce5baa4a3c0c08afa
diff --git a/metadata/md5-cache/dev-python/numba-0.39.0 b/metadata/md5-cache/dev-python/numba-0.39.0
index f355459475f8..e0e272d4786b 100644
--- a/metadata/md5-cache/dev-python/numba-0.39.0
+++ b/metadata/md5-cache/dev-python/numba-0.39.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/llvmlite-0.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/numba/numba/archive/0.39.0.tar.gz -> numba-0.39.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=850734b25b2dd711a500f501ba3d8d61
+_md5_=0d6e81be2244d0b2dedd8771a5d0be4f
diff --git a/metadata/md5-cache/dev-python/numpy-1.14.5 b/metadata/md5-cache/dev-python/numpy-1.14.5
index de0a12000db1..cb235b39d283 100644
--- a/metadata/md5-cache/dev-python/numpy-1.14.5
+++ b/metadata/md5-cache/dev-python/numpy-1.14.5
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 LICENSE=BSD
 RDEPEND=lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.14.5.zip doc? ( http://docs.scipy.org/doc/numpy-1.14.5/numpy-html-1.14.5.zip http://docs.scipy.org/doc/numpy-1.14.5/numpy-ref-1.14.5.pdf http://docs.scipy.org/doc/numpy-1.14.5/numpy-user-1.14.5.pdf )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b90234e1e55f9e41968782e3fc672c21
+_md5_=f74af8968125059864fee0109bd9ec2b
diff --git a/metadata/md5-cache/dev-python/numpy-1.15.4 b/metadata/md5-cache/dev-python/numpy-1.15.4
index 762f540cde51..542a92d4676c 100644
--- a/metadata/md5-cache/dev-python/numpy-1.15.4
+++ b/metadata/md5-cache/dev-python/numpy-1.15.4
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=BSD
 RDEPEND=lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.15.4.zip doc? ( http://docs.scipy.org/doc/numpy-1.15.4/numpy-html-1.15.4.zip http://docs.scipy.org/doc/numpy-1.15.4/numpy-ref-1.15.4.pdf http://docs.scipy.org/doc/numpy-1.15.4/numpy-user-1.15.4.pdf )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5432bfc3cff4591538b8b058de7b56cb
+_md5_=64367852332974a21f97ce8d9c374127
diff --git a/metadata/md5-cache/dev-python/numpy-1.16.1 b/metadata/md5-cache/dev-python/numpy-1.16.1
index 79575d1e5c26..732f97ad4a50 100644
--- a/metadata/md5-cache/dev-python/numpy-1.16.1
+++ b/metadata/md5-cache/dev-python/numpy-1.16.1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=BSD
 RDEPEND=lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.16.1.zip doc? ( https://docs.scipy.org/doc/numpy-1.16.1/numpy-html-1.16.1.zip https://docs.scipy.org/doc/numpy-1.16.1/numpy-ref-1.16.1.pdf https://docs.scipy.org/doc/numpy-1.16.1/numpy-user-1.16.1.pdf )
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dcfe5df70ab44bf27233af15f9516298
+_md5_=18eea042c1983b857c44ce8f06a3a521
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.6.0 b/metadata/md5-cache/dev-python/numpydoc-0.6.0
index 2119149db3bd..5b2a7a558186 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.6.0
+++ b/metadata/md5-cache/dev-python/numpydoc-0.6.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8d61a96fa10d735421282e65b47a547
+_md5_=be2732551d59e24eaa6055e2758e7c95
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.8.0 b/metadata/md5-cache/dev-python/numpydoc-0.8.0
index 93984c23298f..3241579401a8 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.8.0
+++ b/metadata/md5-cache/dev-python/numpydoc-0.8.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-
 LICENSE=BSD
 RDEPEND=dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.8.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8c6dad71b355962ec940594e083d2cda
+_md5_=d66fb4aabdc5da7c145702a5bc6adc30
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.9.1 b/metadata/md5-cache/dev-python/numpydoc-0.9.1
index 6fb080cde0f3..2c84c258d301 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.9.1
+++ b/metadata/md5-cache/dev-python/numpydoc-0.9.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-ma
 LICENSE=BSD
 RDEPEND=dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.9.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6c1d0cdec1f70bf96caa8993c79195f2
+_md5_=79643fcabdb79dcb881556e59191aed3
diff --git a/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1 b/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
index b303ae410bb6..45d6d6e2f088 100644
--- a/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
+++ b/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauth2/oauth2-1.9.0.post1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c1877e6fcff6d5ce8f2198cd69d208b
+_md5_=d50a425dd08b3279ce28f740c53f0db6
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.1.2 b/metadata/md5-cache/dev-python/oauth2client-4.1.2
index ff344f3c07aa..cd58a24ead5f 100644
--- a/metadata/md5-cache/dev-python/oauth2client-4.1.2
+++ b/metadata/md5-cache/dev-python/oauth2client-4.1.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) !<=dev-python/google-api-python-client-1.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/oauth2client/archive/v4.1.2.tar.gz -> oauth2client-4.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7cf04b8d81b08d0d13fdc40f7e4c24f2
+_md5_=96c0f46ee6697535364154e3faabe6e0
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.1.3 b/metadata/md5-cache/dev-python/oauth2client-4.1.3
index ab3a1327756c..7849b756dfca 100644
--- a/metadata/md5-cache/dev-python/oauth2client-4.1.3
+++ b/metadata/md5-cache/dev-python/oauth2client-4.1.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) !<=dev-python/google-api-python-client-1.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/oauth2client/archive/v4.1.3.tar.gz -> oauth2client-4.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb5bf367f64cc791fcbc5244672e49ad
+_md5_=ed1ee08e61ddda86f23dc711bc6aa4d5
diff --git a/metadata/md5-cache/dev-python/oauthlib-1.0.3 b/metadata/md5-cache/dev-python/oauthlib-1.0.3
index e3906c46e88d..a90dd7ecc8ba 100644
--- a/metadata/md5-cache/dev-python/oauthlib-1.0.3
+++ b/metadata/md5-cache/dev-python/oauthlib-1.0.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyjwt-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-1.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2eede317cda7172e82072652746a324e
+_md5_=38f14e487696a1b8ef03e8de513782fd
diff --git a/metadata/md5-cache/dev-python/oauthlib-2.0.2 b/metadata/md5-cache/dev-python/oauthlib-2.0.2
index 23612b270ad3..083d89b4885d 100644
--- a/metadata/md5-cache/dev-python/oauthlib-2.0.2
+++ b/metadata/md5-cache/dev-python/oauthlib-2.0.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/pyjwt-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-2.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=268788f4db875566d61166d8fbff1be0
+_md5_=ca6edd315e593e1bbaef0bfeb85840cb
diff --git a/metadata/md5-cache/dev-python/oauthlib-2.0.3 b/metadata/md5-cache/dev-python/oauthlib-2.0.3
index 2c844a88d91e..b2c9644f8c0c 100644
--- a/metadata/md5-cache/dev-python/oauthlib-2.0.3
+++ b/metadata/md5-cache/dev-python/oauthlib-2.0.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/pyjwt-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-2.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47c1577fbc920b324631677ab904f0ff
+_md5_=66a12da4a9a199c2e17edbcd77edf53f
diff --git a/metadata/md5-cache/dev-python/oauthlib-2.0.6 b/metadata/md5-cache/dev-python/oauthlib-2.0.6
index e95d13b90ef7..980ab4c654d4 100644
--- a/metadata/md5-cache/dev-python/oauthlib-2.0.6
+++ b/metadata/md5-cache/dev-python/oauthlib-2.0.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/pyjwt-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-2.0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4522a2f5451d9e651e2c014d61e7a023
+_md5_=1b3cb4d9f1fbeb8800ccc9fefb5407f2
diff --git a/metadata/md5-cache/dev-python/oauthlib-3.0.1 b/metadata/md5-cache/dev-python/oauthlib-3.0.1
index a932b5fd952d..ef2e45f247e3 100644
--- a/metadata/md5-cache/dev-python/oauthlib-3.0.1
+++ b/metadata/md5-cache/dev-python/oauthlib-3.0.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/pyjwt-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-3.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef387db931fc6912610a1ee9c9742fb6
+_md5_=7a34535696035e404c6f7f1e0adf097c
diff --git a/metadata/md5-cache/dev-python/objgraph-3.4.0 b/metadata/md5-cache/dev-python/objgraph-3.4.0
index 1ebce1197649..1448ca54564b 100644
--- a/metadata/md5-cache/dev-python/objgraph-3.4.0
+++ b/metadata/md5-cache/dev-python/objgraph-3.4.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/objgraph/objgraph-3.4.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=89ef5345f1394b533e3b69309c1a7507
+_md5_=4a96a1adcbe49d74eecd7c62faba45bb
diff --git a/metadata/md5-cache/dev-python/oct2py-3.6.0 b/metadata/md5-cache/dev-python/oct2py-3.6.0
index 98de149abbdd..e9fe97a06e4f 100644
--- a/metadata/md5-cache/dev-python/oct2py-3.6.0
+++ b/metadata/md5-cache/dev-python/oct2py-3.6.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/numpy-1.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-mathematics/octave-4.2.0 python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oct2py/oct2py-3.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=953ae1fb27e53aec7e2e356615182e3e
+_md5_=a31f57744d55b739e92195452d64b751
diff --git a/metadata/md5-cache/dev-python/oct2py-4.0.6 b/metadata/md5-cache/dev-python/oct2py-4.0.6
index 0a1c8c7cec7d..c736f689da43 100644
--- a/metadata/md5-cache/dev-python/oct2py-4.0.6
+++ b/metadata/md5-cache/dev-python/oct2py-4.0.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/numpy-1.11[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/octave_kernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.17[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oct2py/oct2py-4.0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e00648419bdbe0712627864168d01df
+_md5_=dc89fdf55c35f1f6f976d89644b34a8a
diff --git a/metadata/md5-cache/dev-python/odfpy-1.3.6 b/metadata/md5-cache/dev-python/odfpy-1.3.6
index 06e9a1a80688..efa461fafe94 100644
--- a/metadata/md5-cache/dev-python/odfpy-1.3.6
+++ b/metadata/md5-cache/dev-python/odfpy-1.3.6
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/odfpy/odfpy-1.3.6.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c27935e6a6555390813a0703f123acb2
+_md5_=09555b60ed449ffc9a2bc12ae367d889
diff --git a/metadata/md5-cache/dev-python/os-testr-1.0.0 b/metadata/md5-cache/dev-python/os-testr-1.0.0
index 3aada64d9370..663a43eb68dd 100644
--- a/metadata/md5-cache/dev-python/os-testr-1.0.0
+++ b/metadata/md5-cache/dev-python/os-testr-1.0.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-testr/os-testr-1.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c6f4e90215f515a1bfd8cb383d30fec3
+_md5_=682bc4804db0486bf254c6ea491486d9
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-3.27.0 b/metadata/md5-cache/dev-python/oslo-concurrency-3.27.0
index e98a2a7aec83..c3756ddf9174 100644
--- a/metadata/md5-cache/dev-python/oslo-concurrency-3.27.0
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-3.27.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fasteners-0.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.concurrency/oslo.concurrency-3.27.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44059658557ae34472c3d9a4985512de
+_md5_=7f20f16afc24df1ba3aba6a38503aef2
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-3.29.1 b/metadata/md5-cache/dev-python/oslo-concurrency-3.29.1
index 9dda104982d6..1babd0217c69 100644
--- a/metadata/md5-cache/dev-python/oslo-concurrency-3.29.1
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-3.29.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fasteners-0.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.concurrency/oslo.concurrency-3.29.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1dddd077390dd051d64a21b5aa3205b4
+_md5_=ae9181f849603abd7ed55396605213f9
diff --git a/metadata/md5-cache/dev-python/oslo-config-6.4.1 b/metadata/md5-cache/dev-python/oslo-config-6.4.1
index 73c75edcca6c..89b369e50050 100644
--- a/metadata/md5-cache/dev-python/oslo-config-6.4.1
+++ b/metadata/md5-cache/dev-python/oslo-config-6.4.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 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	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd2b284f4db5c03771f17699106e3a83
+_md5_=29e14195fbf96178480d5e48e5a1faa8
diff --git a/metadata/md5-cache/dev-python/oslo-config-6.8.1 b/metadata/md5-cache/dev-python/oslo-config-6.8.1
index 826bf984c7ed..c64588921ea9 100644
--- a/metadata/md5-cache/dev-python/oslo-config-6.8.1
+++ b/metadata/md5-cache/dev-python/oslo-config-6.8.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rfc3986-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 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	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a919d6849c4d591ca3cf08e6329c423e
+_md5_=673425dbcafa094817d88f35249d207a
diff --git a/metadata/md5-cache/dev-python/oslo-context-2.21.0 b/metadata/md5-cache/dev-python/oslo-context-2.21.0
index 79bba6b82123..312b16dd6f54 100644
--- a/metadata/md5-cache/dev-python/oslo-context-2.21.0
+++ b/metadata/md5-cache/dev-python/oslo-context-2.21.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.context/oslo.context-2.21.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=942cacc6f3528b96b721dd43250316e9
+_md5_=877380999bcf47c6d40fcbc455e5da84
diff --git a/metadata/md5-cache/dev-python/oslo-context-2.22.1 b/metadata/md5-cache/dev-python/oslo-context-2.22.1
index 975b655b4e72..c2e1e10ee76b 100644
--- a/metadata/md5-cache/dev-python/oslo-context-2.22.1
+++ b/metadata/md5-cache/dev-python/oslo-context-2.22.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.context/oslo.context-2.22.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3f506e7290168d699958ee0b42ac526d
+_md5_=c556f9181dd02dec99ee4bc484bea8e4
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-3.19.0 b/metadata/md5-cache/dev-python/oslo-i18n-3.19.0
index cadea24bab0c..353e9fabc6fc 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-3.19.0
+++ b/metadata/md5-cache/dev-python/oslo-i18n-3.19.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-3.19.0.tar.gz -> oslo-i18n-3.19.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=16309e19d3cc8da4e0984ea2863a7a74
+_md5_=22d1fc9b70411a318de4952ea2f93b3f
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-3.23.1 b/metadata/md5-cache/dev-python/oslo-i18n-3.23.1
index aab6ed2b55b4..2a459bc8a374 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-3.23.1
+++ b/metadata/md5-cache/dev-python/oslo-i18n-3.23.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-3.23.1.tar.gz -> oslo-i18n-3.23.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df394c12380a7398b9bc6531060306d1
+_md5_=b1444e8f6823deecfcc14ec7deabcf5d
diff --git a/metadata/md5-cache/dev-python/oslo-log-3.39.2 b/metadata/md5-cache/dev-python/oslo-log-3.39.2
index 4ece24e89c1b..b419062b400a 100644
--- a/metadata/md5-cache/dev-python/oslo-log-3.39.2
+++ b/metadata/md5-cache/dev-python/oslo-log-3.39.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyinotify-0.9.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.log/oslo.log-3.39.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b18278f11059c1ca3733d3c01ece404a
+_md5_=943552d5588e6ece22d598635a137643
diff --git a/metadata/md5-cache/dev-python/oslo-log-3.42.3 b/metadata/md5-cache/dev-python/oslo-log-3.42.3
index 258e4e7f883d..e90fc25a78c7 100644
--- a/metadata/md5-cache/dev-python/oslo-log-3.42.3
+++ b/metadata/md5-cache/dev-python/oslo-log-3.42.3
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-3.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.25.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.19.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyinotify-0.9.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.log/oslo.log-3.42.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cee8fbca42be75655b10f8d84e07cfa8
+_md5_=dac6fef8ff8a54f6948a1f897ebc8de3
diff --git a/metadata/md5-cache/dev-python/oslo-log-3.44.1 b/metadata/md5-cache/dev-python/oslo-log-3.44.1
index 635db07063fb..b44b69aedeef 100644
--- a/metadata/md5-cache/dev-python/oslo-log-3.44.1
+++ b/metadata/md5-cache/dev-python/oslo-log-3.44.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-3.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.25.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.19.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyinotify-0.9.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.log/oslo.log-3.44.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=93d9bd0dd9de6952a5200417305f1a1f
+_md5_=3a1efea68debccd7237cf64e826e28cf
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-3.34.0 b/metadata/md5-cache/dev-python/oslo-middleware-3.34.0
index d92cc3315988..96c35bc406f9 100644
--- a/metadata/md5-cache/dev-python/oslo-middleware-3.34.0
+++ b/metadata/md5-cache/dev-python/oslo-middleware-3.34.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/statsd-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-3.34.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=00c454889bb07f3fb956697916bcd1a6
+_md5_=da2e4fb44a8ddcde7d5a1811afce0daa
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-3.37.1 b/metadata/md5-cache/dev-python/oslo-middleware-3.37.1
index 62952e97bee1..85c2a0c48732 100644
--- a/metadata/md5-cache/dev-python/oslo-middleware-3.37.1
+++ b/metadata/md5-cache/dev-python/oslo-middleware-3.37.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/statsd-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-3.37.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b14ffa1e7823ea11fd778bdde3a824ff
+_md5_=d71f3054e1a20dd7e7319c6a45b869ab
diff --git a/metadata/md5-cache/dev-python/oslo-privsep-1.29.2 b/metadata/md5-cache/dev-python/oslo-privsep-1.29.2
index 9034ba77b258..ee335365fc91 100644
--- a/metadata/md5-cache/dev-python/oslo-privsep-1.29.2
+++ b/metadata/md5-cache/dev-python/oslo-privsep-1.29.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/greenlet-0.4.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.privsep/oslo.privsep-1.29.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9993f8b05e49d76857e29747efb89f89
+_md5_=c7f3502ff2c115342a74fccfed4efaff
diff --git a/metadata/md5-cache/dev-python/oslo-privsep-1.32.1 b/metadata/md5-cache/dev-python/oslo-privsep-1.32.1
index 3f7084b18e97..a9f99b9daf08 100644
--- a/metadata/md5-cache/dev-python/oslo-privsep-1.32.1
+++ b/metadata/md5-cache/dev-python/oslo-privsep-1.32.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cffi-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/msgpack-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.privsep/oslo.privsep-1.32.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=de3e3bd80935ea2e95cae8c4fd4e90be
+_md5_=ef6fdb810af50546afddc0b206a6af0e
diff --git a/metadata/md5-cache/dev-python/oslo-rootwrap-5.13.0 b/metadata/md5-cache/dev-python/oslo-rootwrap-5.13.0
index 03619a1669fc..f6b4e1ab291c 100644
--- a/metadata/md5-cache/dev-python/oslo-rootwrap-5.13.0
+++ b/metadata/md5-cache/dev-python/oslo-rootwrap-5.13.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.rootwrap/oslo.rootwrap-5.13.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=131f0d2d5f8fdc072e2cf0e7e7ea2361
+_md5_=a82ba5f77180595476c70418ca4bfa32
diff --git a/metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2 b/metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2
index 5be7729e7bc3..d39b9774cc39 100644
--- a/metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2
+++ b/metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.rootwrap/oslo.rootwrap-5.15.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3e4ac9e87561b53e787e509f19f23767
+_md5_=0d6ee87f88bf7c877290cbcd6f23c4ef
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.31.8 b/metadata/md5-cache/dev-python/oslo-service-1.31.8
index aa589d77ec5c..bd1a62fae911 100644
--- a/metadata/md5-cache/dev-python/oslo-service-1.31.8
+++ b/metadata/md5-cache/dev-python/oslo-service-1.31.8
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/greenlet-0.4.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.service/oslo.service-1.31.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=72648b51f6aca227f0f3441d866944d9
+_md5_=ad32d6727c81bcd157e02adfe400ef6b
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.38.0 b/metadata/md5-cache/dev-python/oslo-service-1.38.0
index 594865e43548..0c64c80632bf 100644
--- a/metadata/md5-cache/dev-python/oslo-service-1.38.0
+++ b/metadata/md5-cache/dev-python/oslo-service-1.38.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.40.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/yappi-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.service/oslo.service-1.38.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4b5ff1d4d2e371ffe954a0e9640fcd73
+_md5_=43524f62fc61203acdcc990a1e2be252
diff --git a/metadata/md5-cache/dev-python/passwordmeter-0.1.8 b/metadata/md5-cache/dev-python/passwordmeter-0.1.8
index d94752112556..94a133085189 100644
--- a/metadata/md5-cache/dev-python/passwordmeter-0.1.8
+++ b/metadata/md5-cache/dev-python/passwordmeter-0.1.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/asset-0.6.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/passwordmeter/passwordmeter-0.1.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a0b6bfbfe1a97db441c5e90c8986197
+_md5_=d426a0c004bf32a254e5206d5b015447
diff --git a/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r1 b/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r1
index 1c20159b9bd6..91c1baf085c2 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r1
+++ b/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=dev-python/namespace-paste[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ianb/pastedeploy/get/1.5.2.tar.gz -> pastedeploy-1.5.2-r1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bd81697b6ba15d301d56e3af40ce7134
+_md5_=7efd800b94f0c413173236e0a76b3f53
diff --git a/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r2 b/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r2
index 6893ebb8c711..8bce39f56d3e 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r2
+++ b/metadata/md5-cache/dev-python/pastedeploy-1.5.2-r2
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~am
 LICENSE=MIT
 RDEPEND=dev-python/namespace-paste[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ianb/pastedeploy/get/1.5.2.tar.gz -> pastedeploy-1.5.2-r1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e1f44c7dad99474bb9a4ad918bd15b1
+_md5_=b8d475347e67c6605b9973795af65f7c
diff --git a/metadata/md5-cache/dev-python/pastedeploy-2.0.1 b/metadata/md5-cache/dev-python/pastedeploy-2.0.1
index f7e97041c443..691d8591d45e 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-2.0.1
+++ b/metadata/md5-cache/dev-python/pastedeploy-2.0.1
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~
 LICENSE=MIT
 RDEPEND=dev-python/namespace-paste[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pylons/pastedeploy/archive/2.0.1.tar.gz -> pastedeploy-2.0.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e7ad7b9d6f2ced1e2c171f8d3f0fbb20
+_md5_=e846bb37fbca5bd68d571f891538be36
diff --git a/metadata/md5-cache/dev-python/path-py-10.3.1 b/metadata/md5-cache/dev-python/path-py-10.3.1
index 036941df4a2b..b46f0fe1a880 100644
--- a/metadata/md5-cache/dev-python/path-py-10.3.1
+++ b/metadata/md5-cache/dev-python/path-py-10.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=dev-python/appdirs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/path.py/path.py-10.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5627caa101bb90a2ab9d665f05fd00d1
+_md5_=abb86e1e508e959ac186a26fbc98f33c
diff --git a/metadata/md5-cache/dev-python/path-py-11.0.1 b/metadata/md5-cache/dev-python/path-py-11.0.1
index 83f3768fa40d..bb06ec34f939 100644
--- a/metadata/md5-cache/dev-python/path-py-11.0.1
+++ b/metadata/md5-cache/dev-python/path-py-11.0.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=dev-python/appdirs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/path.py/path.py-11.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82e5ca5a3396bc2cd4d149856b4af9e4
+_md5_=1199b2eee1397c3ad6694e5ff4e985f9
diff --git a/metadata/md5-cache/dev-python/path-py-8.1.2 b/metadata/md5-cache/dev-python/path-py-8.1.2
index 54786a43e0f4..44821bb0c352 100644
--- a/metadata/md5-cache/dev-python/path-py-8.1.2
+++ b/metadata/md5-cache/dev-python/path-py-8.1.2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/path.py/path.py-8.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dea394bfce0deb7019efd22b3879d1b7
+_md5_=533599030340d71e9e2cbd7050b8f318
diff --git a/metadata/md5-cache/dev-python/patsy-0.4.1 b/metadata/md5-cache/dev-python/patsy-0.4.1
index 67e11768da0d..1332a0a87faf 100644
--- a/metadata/md5-cache/dev-python/patsy-0.4.1
+++ b/metadata/md5-cache/dev-python/patsy-0.4.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/patsy/patsy-0.4.1.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e03376e9318e78f60337608422cfcfa4
+_md5_=ab16ddd20b8c1d6894bfe193b9a477ae
diff --git a/metadata/md5-cache/dev-python/patsy-0.5.1 b/metadata/md5-cache/dev-python/patsy-0.5.1
index 8661950f3bc5..0363d0ed7cdd 100644
--- a/metadata/md5-cache/dev-python/patsy-0.5.1
+++ b/metadata/md5-cache/dev-python/patsy-0.5.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/49/c7/b971d8685c52512dbaa45bf8d076695432245a9f59509fb20a6c8e4ff69a/patsy-0.5.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8b6db6a3d06aea8dd14aeb624cf4c873
+_md5_=fa08a0b61ef62b91f50bf08eab1f3d18
diff --git a/metadata/md5-cache/dev-python/paver-1.2.4 b/metadata/md5-cache/dev-python/paver-1.2.4
index a4d870627d6e..1244f77503bf 100644
--- a/metadata/md5-cache/dev-python/paver-1.2.4
+++ b/metadata/md5-cache/dev-python/paver-1.2.4
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paver/Paver-1.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f475d91db3dfed4595e94efb94dd2519
+_md5_=a8e9f1b7857079650b4f0d1c46a9c06b
diff --git a/metadata/md5-cache/dev-python/paver-1.3.4 b/metadata/md5-cache/dev-python/paver-1.3.4
index 180581ba84c9..96c5e7d7ec59 100644
--- a/metadata/md5-cache/dev-python/paver-1.3.4
+++ b/metadata/md5-cache/dev-python/paver-1.3.4
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paver/Paver-1.3.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea8639dbf8a02d7197c7f8b0e62fd630
+_md5_=b68708756df75d0e3857a4cad21a4cb7
diff --git a/metadata/md5-cache/dev-python/pbr-0.8.2-r1 b/metadata/md5-cache/dev-python/pbr-0.8.2-r1
index 11f5313e53f9..26d8a70bab61 100644
--- a/metadata/md5-cache/dev-python/pbr-0.8.2-r1
+++ b/metadata/md5-cache/dev-python/pbr-0.8.2-r1
@@ -9,7 +9,8 @@ LICENSE=Apache-2.0
 PDEPEND=>dev-python/pip-1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-0.8.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb0c0e9d804c341d87324ffe196faa4e
+_md5_=8b84a7f9e364f979be92c8ca53d7a8dc
diff --git a/metadata/md5-cache/dev-python/pbr-1.10.0-r1 b/metadata/md5-cache/dev-python/pbr-1.10.0-r1
index aacabd63ac7d..04034c0d6309 100644
--- a/metadata/md5-cache/dev-python/pbr-1.10.0-r1
+++ b/metadata/md5-cache/dev-python/pbr-1.10.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-1.10.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=65030047fc39465d53d412f65d8a561f
+_md5_=0fcf7a29b258a137a89a41ccebd3e6af
diff --git a/metadata/md5-cache/dev-python/pbr-3.1.1 b/metadata/md5-cache/dev-python/pbr-3.1.1
index ab2c8e915348..92c7b854cf85 100644
--- a/metadata/md5-cache/dev-python/pbr-3.1.1
+++ b/metadata/md5-cache/dev-python/pbr-3.1.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 x86 ~amd64-linu
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-3.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c0fdc5071640ccee78ba43d5b545ece4
+_md5_=63ce2ffda6f43f8e0661483de630eb9a
diff --git a/metadata/md5-cache/dev-python/pbr-4.1.1 b/metadata/md5-cache/dev-python/pbr-4.1.1
index f5b749cdedc0..4bf7616310ed 100644
--- a/metadata/md5-cache/dev-python/pbr-4.1.1
+++ b/metadata/md5-cache/dev-python/pbr-4.1.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-4.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e7fcd6917ba04e9881285e87219efb9
+_md5_=af5135831d807fd3d633b979fd0ed0e9
diff --git a/metadata/md5-cache/dev-python/pbr-4.2.0-r1 b/metadata/md5-cache/dev-python/pbr-4.2.0-r1
index a368f6d75b85..7d0424e2ed7d 100644
--- a/metadata/md5-cache/dev-python/pbr-4.2.0-r1
+++ b/metadata/md5-cache/dev-python/pbr-4.2.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 hppa ~mips s390 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-4.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e76f45979abd2d8584ed50199ea2e021
+_md5_=5818a41ab210e9f89e97babdc2b16c0f
diff --git a/metadata/md5-cache/dev-python/pbr-4.2.0-r2 b/metadata/md5-cache/dev-python/pbr-4.2.0-r2
index fd40f121ae19..acedc928d5b3 100644
--- a/metadata/md5-cache/dev-python/pbr-4.2.0-r2
+++ b/metadata/md5-cache/dev-python/pbr-4.2.0-r2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-4.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d12842e6bb3d9f6e685d37679bfb1780
+_md5_=07d2a0de22aeb464f91cf384bc048b92
diff --git a/metadata/md5-cache/dev-python/pbr-5.1.1 b/metadata/md5-cache/dev-python/pbr-5.1.1
index e61c141b7ec1..752ca5e14bb4 100644
--- a/metadata/md5-cache/dev-python/pbr-5.1.1
+++ b/metadata/md5-cache/dev-python/pbr-5.1.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linu
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-5.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7265bd322c63a0ef0a0ea2b852963100
+_md5_=1b7ee1d6abff380fc7647bab249b80ed
diff --git a/metadata/md5-cache/dev-python/peak-rules-0.5 b/metadata/md5-cache/dev-python/peak-rules-0.5
index 7d1b218bf55e..a4159c44a7ff 100644
--- a/metadata/md5-cache/dev-python/peak-rules-0.5
+++ b/metadata/md5-cache/dev-python/peak-rules-0.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ZPL
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://peak.telecommunity.com/snapshots/PEAK-Rules-0.5a1.dev-r2713.tar.gz -> peak-rules-0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a30f2865f5eca463aaae2a96857e1c9
+_md5_=b514044e57106c060782aad9f6e0cbd7
diff --git a/metadata/md5-cache/dev-python/pep257-2.1.1 b/metadata/md5-cache/dev-python/pep257-2.1.1
index 9fc82f0e268c..30117ae8b9df 100644
--- a/metadata/md5-cache/dev-python/pep257-2.1.1
+++ b/metadata/md5-cache/dev-python/pep257-2.1.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/pydocstyle/archive/2.1.1.tar.gz -> pep257-2.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0dd893016c11b123002fcc6af0a1a0c6
+_md5_=9090935959e72516080976c8fb73b547
diff --git a/metadata/md5-cache/dev-python/photutils-0.3.1 b/metadata/md5-cache/dev-python/photutils-0.3.1
index 8a342abedbd3..baf502fb9326 100644
--- a/metadata/md5-cache/dev-python/photutils-0.3.1
+++ b/metadata/md5-cache/dev-python/photutils-0.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/photutils/photutils-0.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c34b79f7a04218cf5e4e391a8ec3cd3
+_md5_=b3190bf7093b85218223041b586236e2
diff --git a/metadata/md5-cache/dev-python/photutils-0.3.2 b/metadata/md5-cache/dev-python/photutils-0.3.2
index 7fd3a2511dfc..5a7f83726f6e 100644
--- a/metadata/md5-cache/dev-python/photutils-0.3.2
+++ b/metadata/md5-cache/dev-python/photutils-0.3.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/photutils/photutils-0.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=43875ec4d6b85b7ee25e16839414004d
+_md5_=e0cb3ff1f27efd37388ddf7f5e259eed
diff --git a/metadata/md5-cache/dev-python/pilkit-2.0 b/metadata/md5-cache/dev-python/pilkit-2.0
index 3938cce33a19..fb760a416e81 100644
--- a/metadata/md5-cache/dev-python/pilkit-2.0
+++ b/metadata/md5-cache/dev-python/pilkit-2.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matthewwithanm/pilkit/archive/2.0.tar.gz -> pilkit-2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e36560187deffd1b37904630d3ee6c23
+_md5_=582f27ee2d7a987691251bbd55366715
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.2.2 b/metadata/md5-cache/dev-python/pkgconfig-1.2.2
index 46b86cd298f9..7ab004a3c99f 100644
--- a/metadata/md5-cache/dev-python/pkgconfig-1.2.2
+++ b/metadata/md5-cache/dev-python/pkgconfig-1.2.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgconfig/pkgconfig-1.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5c86f805dbfc8995fd76d0bb03c138b
+_md5_=bf39538537ef9931f76832141d92bce8
diff --git a/metadata/md5-cache/dev-python/pluginbase-0.5 b/metadata/md5-cache/dev-python/pluginbase-0.5
index 54dd7b9bd2cb..b90f48dbf1a4 100644
--- a/metadata/md5-cache/dev-python/pluginbase-0.5
+++ b/metadata/md5-cache/dev-python/pluginbase-0.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluginbase/pluginbase-0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c32adfe1199f19db1d3496cf0f437803
+_md5_=c5fefd9f922afaf96444965935d5714b
diff --git a/metadata/md5-cache/dev-python/plyvel-1.0.5 b/metadata/md5-cache/dev-python/plyvel-1.0.5
index 4730f1d12bd2..895ecb1e53a3 100644
--- a/metadata/md5-cache/dev-python/plyvel-1.0.5
+++ b/metadata/md5-cache/dev-python/plyvel-1.0.5
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/leveldb-1.20:= python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/plyvel/plyvel-1.0.5.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=64684f0186d1dc895a97eae3ae57d871
+_md5_=14d5247390c3535a21192a2323f24079
diff --git a/metadata/md5-cache/dev-python/plyvel-1.1.0 b/metadata/md5-cache/dev-python/plyvel-1.1.0
index 59043d8352a1..2522252e79e0 100644
--- a/metadata/md5-cache/dev-python/plyvel-1.1.0
+++ b/metadata/md5-cache/dev-python/plyvel-1.1.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/leveldb-1.20:= python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/plyvel/plyvel-1.1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6693840381ac132a2028493b4c68f76d
+_md5_=01ab16631454922efe500dad4147008d
diff --git a/metadata/md5-cache/dev-python/pockets-0.3 b/metadata/md5-cache/dev-python/pockets-0.3
index 0a0273fad484..4b04ecf59e23 100644
--- a/metadata/md5-cache/dev-python/pockets-0.3
+++ b/metadata/md5-cache/dev-python/pockets-0.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pockets/pockets-0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=52e4ac28e155c4f6e18f678a08ff8187
+_md5_=fc0d9ec35c0046b6dc6e57560978c679
diff --git a/metadata/md5-cache/dev-python/portend-2.2 b/metadata/md5-cache/dev-python/portend-2.2
index d0650999dc66..72ade1e87f8a 100644
--- a/metadata/md5-cache/dev-python/portend-2.2
+++ b/metadata/md5-cache/dev-python/portend-2.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9312b3fe8fad7317a29975932545a76a
+_md5_=28f5a8ae9d14aecc686cf3acee44d1e2
diff --git a/metadata/md5-cache/dev-python/portend-2.2-r1 b/metadata/md5-cache/dev-python/portend-2.2-r1
index e5b92ca4c58a..919700e82a72 100644
--- a/metadata/md5-cache/dev-python/portend-2.2-r1
+++ b/metadata/md5-cache/dev-python/portend-2.2-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=00ba024c4920551a6bdfa74b1e323b7d
+_md5_=914dfb001964954a60624873e503e22f
diff --git a/metadata/md5-cache/dev-python/poyo-0.4.1 b/metadata/md5-cache/dev-python/poyo-0.4.1
index 83cc39334aaf..206a56b3456c 100644
--- a/metadata/md5-cache/dev-python/poyo-0.4.1
+++ b/metadata/md5-cache/dev-python/poyo-0.4.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/poyo/poyo-0.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7f1573e0dc526f7e69e37ba3699a918c
+_md5_=c3ed6b95c0e1674c2d16cf2b3cf71f84
diff --git a/metadata/md5-cache/dev-python/pretty-yaml-15.6.3 b/metadata/md5-cache/dev-python/pretty-yaml-15.6.3
index 46cd0380c457..84f2cd068abe 100644
--- a/metadata/md5-cache/dev-python/pretty-yaml-15.6.3
+++ b/metadata/md5-cache/dev-python/pretty-yaml-15.6.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=WTFPL-2
 RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyaml/pyaml-15.6.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41589e20556a07f7e6782721ea1ebd44
+_md5_=743ae664770d7c399225c748c4e11217
diff --git a/metadata/md5-cache/dev-python/pretty-yaml-15.8.2 b/metadata/md5-cache/dev-python/pretty-yaml-15.8.2
index b36035178b6d..2277e8c29729 100644
--- a/metadata/md5-cache/dev-python/pretty-yaml-15.8.2
+++ b/metadata/md5-cache/dev-python/pretty-yaml-15.8.2
@@ -9,7 +9,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=WTFPL-2
 RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyaml/pyaml-15.8.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bc91f5008b1544ade24c09270cf33e2a
+_md5_=3c8366db8844ec3259e30038e45b4805
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.1-r1 b/metadata/md5-cache/dev-python/prettytable-0.7.1-r1
index f8927dc9e1c0..74414bf50732 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PrettyTable/prettytable-0.7.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57012bb1edcb7b6f4d0bcc91f4ea386f
+_md5_=410ab5dbfcd89b0cebbb3d70cb1e7f45
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.2 b/metadata/md5-cache/dev-python/prettytable-0.7.2
index 27f92f903db1..dd48a64bbd42 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.2
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PrettyTable/prettytable-0.7.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef269db2a3dd9e801288b17b82830e74
+_md5_=414a5f0d7ddf691f8020e250e4f9180f
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.2-r1 b/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
index 334f57660dcf..d2006b0df683 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PrettyTable/prettytable-0.7.2.tar.bz2
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7ce8bec62c231003bd2cca866e1defa7
+_md5_=689a0cc2a5d8a6152f25ce1cb0e9f684
diff --git a/metadata/md5-cache/dev-python/process-tests-1.2.0 b/metadata/md5-cache/dev-python/process-tests-1.2.0
index adcb2f99da2b..3d17a64b46c4 100644
--- a/metadata/md5-cache/dev-python/process-tests-1.2.0
+++ b/metadata/md5-cache/dev-python/process-tests-1.2.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/process-tests/process-tests-1.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f169ae301a1051911966827d1607bf1
+_md5_=1c2666d7f1002150c06c361c834673de
diff --git a/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.4.1 b/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.4.1
index 71d58c61fc02..1a80f5fd81af 100644
--- a/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.4.1
+++ b/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.4.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/prometheus_client[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rycus86/prometheus_flask_exporter/archive/0.4.1.tar.gz -> prometheus_flask_exporter-0.4.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=68b5a980bb0fd0687e902694e331994f
+_md5_=4946e384cec716f5b03236e26748ca1a
diff --git a/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.5.1 b/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.5.1
index 1028ec46cfbc..d3789f0608a7 100644
--- a/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.5.1
+++ b/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.5.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/prometheus_client[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rycus86/prometheus_flask_exporter/archive/0.5.1.tar.gz -> prometheus_flask_exporter-0.5.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=68b5a980bb0fd0687e902694e331994f
+_md5_=4946e384cec716f5b03236e26748ca1a
diff --git a/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.7.2 b/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.7.2
index f78a4d1e31be..5a070fcfc00a 100644
--- a/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.7.2
+++ b/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.7.2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/prometheus_client[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rycus86/prometheus_flask_exporter/archive/0.7.2.tar.gz -> prometheus_flask_exporter-0.7.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=68b5a980bb0fd0687e902694e331994f
+_md5_=4946e384cec716f5b03236e26748ca1a
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15 b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
index e8c0e5f40c64..30a8cf01c520 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-1.0.15.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74485c41b5b289eaa5876da8aef295ff
+_md5_=7fdda526d1ee30b112210ac8e32f3a26
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-2.0.6 b/metadata/md5-cache/dev-python/prompt_toolkit-2.0.6
index 4b6f54047cbc..e96d997ddb0c 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-2.0.6
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-2.0.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-2.0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a772cf9aedc7711c5b14af6e2952fc6a
+_md5_=6eb0394b75122b25793375127463ac4e
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-2.0.7 b/metadata/md5-cache/dev-python/prompt_toolkit-2.0.7
index 4b392e0dd776..d35113582a5b 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-2.0.7
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-2.0.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-2.0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c9d52fa77ddd2f0843562fb931d7ef6
+_md5_=5c986de0111e060c21c818556635fa7f
diff --git a/metadata/md5-cache/dev-python/prov-1.5.1 b/metadata/md5-cache/dev-python/prov-1.5.1
index 6a1787fd896e..fe5e2a0224fb 100644
--- a/metadata/md5-cache/dev-python/prov-1.5.1
+++ b/metadata/md5-cache/dev-python/prov-1.5.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rdflib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prov/prov-1.5.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7faccb3c303ee2cc90af234a53266756
+_md5_=ca0080b9766efc2334eea11733db19d0
diff --git a/metadata/md5-cache/dev-python/prov-1.5.3 b/metadata/md5-cache/dev-python/prov-1.5.3
index 6f2d24eac954..55fb2d26dc17 100644
--- a/metadata/md5-cache/dev-python/prov-1.5.3
+++ b/metadata/md5-cache/dev-python/prov-1.5.3
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rdflib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prov/prov-1.5.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7faccb3c303ee2cc90af234a53266756
+_md5_=ca0080b9766efc2334eea11733db19d0
diff --git a/metadata/md5-cache/dev-python/pushbullet-py-0.10.0 b/metadata/md5-cache/dev-python/pushbullet-py-0.10.0
index 26fa115cf576..b2da367608c6 100644
--- a/metadata/md5-cache/dev-python/pushbullet-py-0.10.0
+++ b/metadata/md5-cache/dev-python/pushbullet-py-0.10.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/python-magic[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/randomchars/pushbullet.py/archive/0.10.0.tar.gz -> pushbullet-py-0.10.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eebea974c7f1bd8cd6d28c54a3a7d9c5
+_md5_=3c837104c69df8bbbb197a8b6ce2ef1a
diff --git a/metadata/md5-cache/dev-python/pushbullet-py-0.11.0 b/metadata/md5-cache/dev-python/pushbullet-py-0.11.0
index f3a953a1830d..b204c02251c1 100644
--- a/metadata/md5-cache/dev-python/pushbullet-py-0.11.0
+++ b/metadata/md5-cache/dev-python/pushbullet-py-0.11.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-magic[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pushbullet-py/pushbullet.py-0.11.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1338cf450b66c744dc3ed8650dd3701
+_md5_=6eb068e10498a64bea33c2d5f23dffce
diff --git a/metadata/md5-cache/dev-python/pxml-0.2.12 b/metadata/md5-cache/dev-python/pxml-0.2.12
index 781f78872bb5..3e10e0874275 100644
--- a/metadata/md5-cache/dev-python/pxml-0.2.12
+++ b/metadata/md5-cache/dev-python/pxml-0.2.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=dev-python/blessings-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pxml/pxml-0.2.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c5693d7c1f56daa6a8cf48a037b35d18
+_md5_=b12c34bf05a9cd2051ec7bf5a2ea0d3c
diff --git a/metadata/md5-cache/dev-python/py-amqp-2.3.2 b/metadata/md5-cache/dev-python/py-amqp-2.3.2
index bce67b5e133c..f9fd572887ce 100644
--- a/metadata/md5-cache/dev-python/py-amqp-2.3.2
+++ b/metadata/md5-cache/dev-python/py-amqp-2.3.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-2.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b86d68efc71f3bb63067909b04e586d
+_md5_=fab270a4e2ffff2133ea042cf8c07324
diff --git a/metadata/md5-cache/dev-python/py-amqp-2.4.2 b/metadata/md5-cache/dev-python/py-amqp-2.4.2
index f49a0ced05bc..3797a958a34a 100644
--- a/metadata/md5-cache/dev-python/py-amqp-2.4.2
+++ b/metadata/md5-cache/dev-python/py-amqp-2.4.2
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-2.4.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=55136c9c40d466f7006fb7c845836e45
+_md5_=5d56d5341a98216e500728634de98bba
diff --git a/metadata/md5-cache/dev-python/py-notify-0.3.1-r1 b/metadata/md5-cache/dev-python/py-notify-0.3.1-r1
index b82b775e5449..91fae8fb4c7e 100644
--- a/metadata/md5-cache/dev-python/py-notify-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/py-notify-0.3.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.gna.org/py-notify/py-notify-0.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5bab706058f94083109fb13db0b5fcd4
+_md5_=f429121d04323cfafc6fb02f9801df18
diff --git a/metadata/md5-cache/dev-python/pyamg-2.2.1 b/metadata/md5-cache/dev-python/pyamg-2.2.1
index eddd364bdb6a..b62ed29a2742 100644
--- a/metadata/md5-cache/dev-python/pyamg-2.2.1
+++ b/metadata/md5-cache/dev-python/pyamg-2.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyamg/pyamg-2.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29a73920905965663ac4a0d405e1b141
+_md5_=32f05c1654b4e6f101cdd304edcccac2
diff --git a/metadata/md5-cache/dev-python/pyamg-3.0.2 b/metadata/md5-cache/dev-python/pyamg-3.0.2
index bbac794e2c34..39727435b5da 100644
--- a/metadata/md5-cache/dev-python/pyamg-3.0.2
+++ b/metadata/md5-cache/dev-python/pyamg-3.0.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyamg/pyamg-3.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f80538bd7140d4d24fd156d20c6d6c2a
+_md5_=76a2c91e89c63f9ce9d438b4351829ba
diff --git a/metadata/md5-cache/dev-python/pyamg-3.2.1 b/metadata/md5-cache/dev-python/pyamg-3.2.1
index 191cb4d04393..22688e80e9f2 100644
--- a/metadata/md5-cache/dev-python/pyamg-3.2.1
+++ b/metadata/md5-cache/dev-python/pyamg-3.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyamg/pyamg-3.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ca4c54586d1c6db2ab7d4072699098e
+_md5_=9d4beecb54c07b5db7929be5f7a272c5
diff --git a/metadata/md5-cache/dev-python/pyamg-3.2.1-r1 b/metadata/md5-cache/dev-python/pyamg-3.2.1-r1
index 49a8a560b78b..cc3cbf8cb298 100644
--- a/metadata/md5-cache/dev-python/pyamg-3.2.1-r1
+++ b/metadata/md5-cache/dev-python/pyamg-3.2.1-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyamg/pyamg-3.2.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=be201ca2f348e646e4e221fb7d845af1
+_md5_=d23d77af6fb8829ecb01a78c292d5405
diff --git a/metadata/md5-cache/dev-python/pyavm-0.9.4 b/metadata/md5-cache/dev-python/pyavm-0.9.4
index 2ed12e8dea75..663e143b84dd 100644
--- a/metadata/md5-cache/dev-python/pyavm-0.9.4
+++ b/metadata/md5-cache/dev-python/pyavm-0.9.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyAVM/PyAVM-0.9.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c19e1a714d420ae4f8bc70c230aca086
+_md5_=d40e535619a7878a4f837af830748834
diff --git a/metadata/md5-cache/dev-python/pycairo-1.16.3-r1 b/metadata/md5-cache/dev-python/pycairo-1.16.3-r1
index 8727a2f77be8..5d31821fcc21 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.16.3-r1
+++ b/metadata/md5-cache/dev-python/pycairo-1.16.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.13.1[svg] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.16.3/pycairo-1.16.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2b0a4716cd4b17ec30a8a1608bcab36
+_md5_=77e8746f31e65c21ba66f86c5fc62cad
diff --git a/metadata/md5-cache/dev-python/pycairo-1.17.0-r1 b/metadata/md5-cache/dev-python/pycairo-1.17.0-r1
index fd13e9366294..94a1c68d41f4 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.17.0-r1
+++ b/metadata/md5-cache/dev-python/pycairo-1.17.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.13.1[svg] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.17.0/pycairo-1.17.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=120c1cb03bb8e6213785e3842a5f45ec
+_md5_=dfda04bf13a7ff12a70c9bff33b6e095
diff --git a/metadata/md5-cache/dev-python/pycairo-1.18.1 b/metadata/md5-cache/dev-python/pycairo-1.18.1
index 06fcf1329937..bd51f0471159 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.18.1
+++ b/metadata/md5-cache/dev-python/pycairo-1.18.1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.13.1[svg] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.18.1/pycairo-1.18.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=252041086a2dad41b060a76124814d9b
+_md5_=b7d920e16d2bf0179c25e0b5706669ee
diff --git a/metadata/md5-cache/dev-python/pychef-0.2.3 b/metadata/md5-cache/dev-python/pychef-0.2.3
index 47d7024178a4..dcb2b1f37e6b 100644
--- a/metadata/md5-cache/dev-python/pychef-0.2.3
+++ b/metadata/md5-cache/dev-python/pychef-0.2.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyChef/PyChef-0.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=741cc4f4f09f6b0a9f2f9bfdd98a8331
+_md5_=ccf1e51d92b70bcd0defd9bde0eb8a2f
diff --git a/metadata/md5-cache/dev-python/pycobertura-0.10.0 b/metadata/md5-cache/dev-python/pycobertura-0.10.0
index a649917ce154..10fff6a75b3d 100644
--- a/metadata/md5-cache/dev-python/pycobertura-0.10.0
+++ b/metadata/md5-cache/dev-python/pycobertura-0.10.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/tabulate[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycobertura/pycobertura-0.10.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b5d457fda032c003e04afa91268ae2f6
+_md5_=3ca76967fef25de9340bafa8a04f1cea
diff --git a/metadata/md5-cache/dev-python/pycountry-16.11.8 b/metadata/md5-cache/dev-python/pycountry-16.11.8
index 06283d289723..0752df2e84f9 100644
--- a/metadata/md5-cache/dev-python/pycountry-16.11.8
+++ b/metadata/md5-cache/dev-python/pycountry-16.11.8
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~ia64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycountry/pycountry-16.11.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=04ef3e7b64b51683e90aeed646cc2845
+_md5_=0d81a5fa6a2042feed87ae3fcb8ba6de
diff --git a/metadata/md5-cache/dev-python/pycountry-17.9.23 b/metadata/md5-cache/dev-python/pycountry-17.9.23
index a3549c16f1cb..1079aefedbd7 100644
--- a/metadata/md5-cache/dev-python/pycountry-17.9.23
+++ b/metadata/md5-cache/dev-python/pycountry-17.9.23
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycountry/pycountry-17.9.23.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99a5e1c0070ab71ef9911d6783f8267e
+_md5_=71f77f9956b3b6c82efbda9598b3e970
diff --git a/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2 b/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2
index 0a12927d1a62..6a423bd7c14e 100644
--- a/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2
+++ b/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x
 LICENSE=PSF-2 public-domain
 RDEPEND=gmp? ( dev-libs/gmp:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=test? ( gmp ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=165b3d5bb841850f2b5641c8fc6ce80e
+_md5_=33a7fd86cc965e94ef52221682d1e3cf
diff --git a/metadata/md5-cache/dev-python/pycurl-7.43.0 b/metadata/md5-cache/dev-python/pycurl-7.43.0
index ec9e7729d45e..536191ed99e2 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.43.0
+++ b/metadata/md5-cache/dev-python/pycurl-7.43.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_libressl? ( dev-libs/libressl:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycurl/pycurl-7.43.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=667c7e2db0f2445043d220b8d3c994c1
+_md5_=a54324956915c6d050d6548a31a3c664
diff --git a/metadata/md5-cache/dev-python/pycurl-7.43.0.2 b/metadata/md5-cache/dev-python/pycurl-7.43.0.2
index d1aa52c99ea9..704555aa162a 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.43.0.2
+++ b/metadata/md5-cache/dev-python/pycurl-7.43.0.2
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_libressl? ( dev-libs/libressl:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycurl/pycurl-7.43.0.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c2d5d63c178a240bc082c732d302412a
+_md5_=30de0b3058436f9d9161efa0901ed764
diff --git a/metadata/md5-cache/dev-python/pycurl-7.43.0.3 b/metadata/md5-cache/dev-python/pycurl-7.43.0.3
index c6010f5345e6..aa507ae91a8e 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.43.0.3
+++ b/metadata/md5-cache/dev-python/pycurl-7.43.0.3
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_libressl? ( dev-libs/libressl:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycurl/pycurl-7.43.0.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c2d5d63c178a240bc082c732d302412a
+_md5_=30de0b3058436f9d9161efa0901ed764
diff --git a/metadata/md5-cache/dev-python/pydl-0.5.3 b/metadata/md5-cache/dev-python/pydl-0.5.3
index 95e2bde62b77..5aae04339d95 100644
--- a/metadata/md5-cache/dev-python/pydl-0.5.3
+++ b/metadata/md5-cache/dev-python/pydl-0.5.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydl/pydl-0.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9231858d54b9b6a86e8d2a19b98f2e6f
+_md5_=37123e16adec6b79cf18246587b4877f
diff --git a/metadata/md5-cache/dev-python/pydl-0.5.4 b/metadata/md5-cache/dev-python/pydl-0.5.4
index 2c3236d6685b..2c2bef0b756e 100644
--- a/metadata/md5-cache/dev-python/pydl-0.5.4
+++ b/metadata/md5-cache/dev-python/pydl-0.5.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydl/pydl-0.5.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c0001ec9a72266836410ad7f3f33ca95
+_md5_=56306744d474ed7119b00643f3482c53
diff --git a/metadata/md5-cache/dev-python/pydot-1.2.3 b/metadata/md5-cache/dev-python/pydot-1.2.3
index 0672df4800b7..dd3b3f7f51f8 100644
--- a/metadata/md5-cache/dev-python/pydot-1.2.3
+++ b/metadata/md5-cache/dev-python/pydot-1.2.3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~a
 LICENSE=MIT
 RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erocarrera/pydot/archive/v1.2.3.tar.gz -> pydot-1.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=084f09e097d9c1f0df8a8aaf8ed10e35
+_md5_=0a419e9aa592301d55190fc94da573fc
diff --git a/metadata/md5-cache/dev-python/pydot-1.4.1 b/metadata/md5-cache/dev-python/pydot-1.4.1
index 2222c1861cd0..14fb1021dd4f 100644
--- a/metadata/md5-cache/dev-python/pydot-1.4.1
+++ b/metadata/md5-cache/dev-python/pydot-1.4.1
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~a
 LICENSE=MIT
 RDEPEND=>=dev-python/pyparsing-2.1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erocarrera/pydot/archive/v1.4.1.tar.gz -> pydot-1.4.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7799bdd633eabd66c6a59cd8de8d4ba3
+_md5_=b3090716efdcb767f61b6e7e7ee06e04
diff --git a/metadata/md5-cache/dev-python/pydot-ng-1.0.0 b/metadata/md5-cache/dev-python/pydot-ng-1.0.0
index 6c36d3af6269..259df4da1957 100644
--- a/metadata/md5-cache/dev-python/pydot-ng-1.0.0
+++ b/metadata/md5-cache/dev-python/pydot-ng-1.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pydot/pydot-ng/archive/1.0.0.tar.gz -> pydot-ng-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dddf0693a92231c7a0f3774cf425a62f
+_md5_=77d1bdfc937a82de460c6c9d459c1638
diff --git a/metadata/md5-cache/dev-python/pyee-1.0.2 b/metadata/md5-cache/dev-python/pyee-1.0.2
index 8f7756f3beb2..ba0be4ad94ee 100644
--- a/metadata/md5-cache/dev-python/pyee-1.0.2
+++ b/metadata/md5-cache/dev-python/pyee-1.0.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyee/pyee-1.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83ae4ed8e6d98b1f05aa049d39f66f2b
+_md5_=1e5d7021b189d0b3beca5b6f6532be29
diff --git a/metadata/md5-cache/dev-python/pyenchant-1.6.6 b/metadata/md5-cache/dev-python/pyenchant-1.6.6
index cae837132f57..0c9d55af4272 100644
--- a/metadata/md5-cache/dev-python/pyenchant-1.6.6
+++ b/metadata/md5-cache/dev-python/pyenchant-1.6.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm arm64 hppa ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-text/enchant-1.6 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyenchant/pyenchant-1.6.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f81f0f2c05b5a0a45cbb520a00e06fee
+_md5_=49233056d44d30debe9d4f435fa6b072
diff --git a/metadata/md5-cache/dev-python/pyenchant-1.6.8 b/metadata/md5-cache/dev-python/pyenchant-1.6.8
index 609871212467..cc7e7e3a62e6 100644
--- a/metadata/md5-cache/dev-python/pyenchant-1.6.8
+++ b/metadata/md5-cache/dev-python/pyenchant-1.6.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-text/enchant-1.6 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyenchant/pyenchant-1.6.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7f5bf4d3f059a9408f2634158e49412f
+_md5_=85a45517c276606383883e2c9e5440f5
diff --git a/metadata/md5-cache/dev-python/pyenchant-2.0.0 b/metadata/md5-cache/dev-python/pyenchant-2.0.0
index e7cdc592566c..ea93d107435c 100644
--- a/metadata/md5-cache/dev-python/pyenchant-2.0.0
+++ b/metadata/md5-cache/dev-python/pyenchant-2.0.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/enchant python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyenchant/pyenchant-2.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7b60a23e8105d1b233468347844a1de1
+_md5_=2e89ba5517b1832f8715c9b8eef4286f
diff --git a/metadata/md5-cache/dev-python/pyfakefs-3.5.8 b/metadata/md5-cache/dev-python/pyfakefs-3.5.8
index 05d9f06b5f67..3ed0a3b6db95 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-3.5.8
+++ b/metadata/md5-cache/dev-python/pyfakefs-3.5.8
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v3.5.8.tar.gz -> pyfakefs-3.5.8.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=155e5a0a6fc183e9d79540a00e4417f5
+_md5_=e4f89bbcd9b86a6ea0d0bd465aeddac5
diff --git a/metadata/md5-cache/dev-python/pyfits-3.3-r1 b/metadata/md5-cache/dev-python/pyfits-3.3-r1
index 461c07ab847f..85d839e2ecbb 100644
--- a/metadata/md5-cache/dev-python/pyfits-3.3-r1
+++ b/metadata/md5-cache/dev-python/pyfits-3.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/cfitsio:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfits/pyfits-3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e2ac331c1e739592f9ecc78560d0c40
+_md5_=3d53e9fa415ea7d45b6b581a6b75f33c
diff --git a/metadata/md5-cache/dev-python/pyfits-3.4-r1 b/metadata/md5-cache/dev-python/pyfits-3.4-r1
index eaef97aa0178..77e5ed54aec9 100644
--- a/metadata/md5-cache/dev-python/pyfits-3.4-r1
+++ b/metadata/md5-cache/dev-python/pyfits-3.4-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/cfitsio:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfits/pyfits-3.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=98a4cdde30206561028606fd12d4f4fb
+_md5_=06df5600044b25f176b72c64c4b7562a
diff --git a/metadata/md5-cache/dev-python/pyformance-0.3.4 b/metadata/md5-cache/dev-python/pyformance-0.3.4
index 37e423450286..35e545c35ca9 100644
--- a/metadata/md5-cache/dev-python/pyformance-0.3.4
+++ b/metadata/md5-cache/dev-python/pyformance-0.3.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyformance/pyformance-0.3.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0e3255c4ef9e396d479206c323620b4
+_md5_=c9f1f6e766b5360083674ae317a0d676
diff --git a/metadata/md5-cache/dev-python/pyformance-0.4 b/metadata/md5-cache/dev-python/pyformance-0.4
index 6eeb4dbd7560..a912c97d4ec2 100644
--- a/metadata/md5-cache/dev-python/pyformance-0.4
+++ b/metadata/md5-cache/dev-python/pyformance-0.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyformance/pyformance-0.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd57300daed58547bc62d76e7403e899
+_md5_=b0e8b5a76f2ba84c0b539e576f2c0bae
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.1 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.1
index 82b02dc687de..cd8809f5cc01 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.1
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 LICENSE=MIT
 RDEPEND=ssl? ( dev-python/pyopenssl[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyftpdlib/pyftpdlib-1.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4ab5e29401e5c7aa349f576c234d3cf
+_md5_=1dbfad3bccd58a6e5c73705e8d7d5126
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.3 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.3
index 684f04560fda..41fb28907511 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.3
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sp
 LICENSE=MIT
 RDEPEND=ssl? ( dev-python/pyopenssl[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyftpdlib/pyftpdlib-1.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9af2eb5ca4cf26da9e3a076237fe3e6
+_md5_=9949b6632b886f5f378aad3189793bc3
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.4 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
index beaad3af9a66..b5ba79bfc3dd 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 LICENSE=MIT
 RDEPEND=ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyftpdlib/pyftpdlib-1.5.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=667c0abf99fc97203aab9afcda285149
+_md5_=a319c1de8fd329388fe5a25accbda363
diff --git a/metadata/md5-cache/dev-python/pygal-2.4.0 b/metadata/md5-cache/dev-python/pygal-2.4.0
index 0ababe5843e7..bc6c2f5b6902 100644
--- a/metadata/md5-cache/dev-python/pygal-2.4.0
+++ b/metadata/md5-cache/dev-python/pygal-2.4.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/cairosvg[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kozea/pygal/archive/2.4.0.tar.gz -> pygal-2.4.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1db744dda7a6b30fd1b42b86ef4a74f3
+_md5_=4ec0f4bd1e4692ccc70b4597c74616b2
diff --git a/metadata/md5-cache/dev-python/pygcrypt-1.0.0 b/metadata/md5-cache/dev-python/pygcrypt-1.0.0
index 5bdc10c408cd..f9729d0573b7 100644
--- a/metadata/md5-cache/dev-python/pygcrypt-1.0.0
+++ b/metadata/md5-cache/dev-python/pygcrypt-1.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0= virtual/python-cffi[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygcrypt/pygcrypt-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7db003f3a49eae59ec20f5af5ec023eb
+_md5_=7106c2a8e5927b02c1facb234afd692c
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.0.22 b/metadata/md5-cache/dev-python/pyghmi-1.0.22
index de0af8484955..6a31fac9f02f 100644
--- a/metadata/md5-cache/dev-python/pyghmi-1.0.22
+++ b/metadata/md5-cache/dev-python/pyghmi-1.0.22
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.0.22.tar.gz -> pyghmi-1.0.22.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8e725769e1d35df5dde9b4435f5b953
+_md5_=fb3f731ce31a3236726a286a0d3370bc
diff --git a/metadata/md5-cache/dev-python/pygobject-2.28.6-r55 b/metadata/md5-cache/dev-python/pygobject-2.28.6-r55
index ebaf07f46a85..df839715e336 100644
--- a/metadata/md5-cache/dev-python/pygobject-2.28.6-r55
+++ b/metadata/md5-cache/dev-python/pygobject-2.28.6-r55
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.24.0:2 dev-lang/python-exec:2 libffi? ( virtual/libffi:= ) python_targets_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/pygtk-2.23
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/pygobject/2.28/pygobject-2.28.6.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a17f5e298063f7dfc602bb89a13ec0df
+_md5_=29ff84231abee1a87e83370010f218c2
diff --git a/metadata/md5-cache/dev-python/pygobject-3.28.3 b/metadata/md5-cache/dev-python/pygobject-3.28.3
index 0262f4912272..7be888484512 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.28.3
+++ b/metadata/md5-cache/dev-python/pygobject-3.28.3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd
 LICENSE=LGPL-2.1+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.46.0:= virtual/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/cairo ) !<dev-python/pygtk-2.13 !<dev-python/pygobject-2.28.6-r50:2[introspection]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) test? ( cairo )
+RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.28/pygobject-3.28.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=984e0b2ab46b1ca51b5080535eae54fd
+_md5_=a6cb41b2de5238f0121f92ff22b03488
diff --git a/metadata/md5-cache/dev-python/pygpu-0.6.0 b/metadata/md5-cache/dev-python/pygpu-0.6.0
index 149c10eb9e2e..63b77d7ef227 100644
--- a/metadata/md5-cache/dev-python/pygpu-0.6.0
+++ b/metadata/md5-cache/dev-python/pygpu-0.6.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-libs/libgpuarray:=[cuda?,opencl?] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Theano/libgpuarray/archive/v0.6.0.tar.gz -> pygpu-0.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f0e817eeb90a1120dad9ea94bdeff2ec
+_md5_=0e7cca1a2a53c6679381a2ebe414782e
diff --git a/metadata/md5-cache/dev-python/pygpu-0.6.7 b/metadata/md5-cache/dev-python/pygpu-0.6.7
index 385c7c79c69c..4341258f51e7 100644
--- a/metadata/md5-cache/dev-python/pygpu-0.6.7
+++ b/metadata/md5-cache/dev-python/pygpu-0.6.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libgpuarray:=[cuda?,opencl?] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Theano/libgpuarray/archive/v0.6.7.tar.gz -> pygpu-0.6.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6635445541e65167b4ee572bef1c6b71
+_md5_=115e94a78cd2b752e0a247a1e7f1493b
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.3.1 b/metadata/md5-cache/dev-python/pygraphviz-1.3.1
index 0269f2c6a650..aee4d0e78570 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.3.1
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.3.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 ~ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygraphviz/pygraphviz-1.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3c110abfa7f6e166bd1adf694920f7c
+_md5_=a7f2e68b626c20375024c1ce0fe06ae3
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.5 b/metadata/md5-cache/dev-python/pygraphviz-1.5
index b5b977ec8769..292bbd4e4ce4 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.5
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.5
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygraphviz/pygraphviz-1.5.zip
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ce222f4b2e139aeb0b473f3db7730bbc
+_md5_=0a4cb7ea59d7c52d663eeeb4a599148f
diff --git a/metadata/md5-cache/dev-python/pygtk-2.24.0-r4 b/metadata/md5-cache/dev-python/pygtk-2.24.0-r4
index 0b4a977a7bb3..0adaacbf2808 100644
--- a/metadata/md5-cache/dev-python/pygtk-2.24.0-r4
+++ b/metadata/md5-cache/dev-python/pygtk-2.24.0-r4
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-li
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_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-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.24:2 >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-2.26.8-r53:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/libglade-2.5:2.0
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/pygtk/2.24/pygtk-2.24.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de3997a2f8b31118d68a1862612e63c9
+_md5_=629b1fb6a11989db2bc47fd161fc2710
diff --git a/metadata/md5-cache/dev-python/pyhcl-0.2.3 b/metadata/md5-cache/dev-python/pyhcl-0.2.3
index 1c14192da4a7..4bdd9443224c 100644
--- a/metadata/md5-cache/dev-python/pyhcl-0.2.3
+++ b/metadata/md5-cache/dev-python/pyhcl-0.2.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/ply-3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyhcl/pyhcl-0.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1f9017b3aa37fd3ba204ad4ddb42431
+_md5_=f8eb6404ebf3c8b7b94681dce5505134
diff --git a/metadata/md5-cache/dev-python/pyhcl-0.3.6 b/metadata/md5-cache/dev-python/pyhcl-0.3.6
index 7e19cc506094..6f211e89db46 100644
--- a/metadata/md5-cache/dev-python/pyhcl-0.3.6
+++ b/metadata/md5-cache/dev-python/pyhcl-0.3.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/ply-3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyhcl/pyhcl-0.3.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1f9017b3aa37fd3ba204ad4ddb42431
+_md5_=f8eb6404ebf3c8b7b94681dce5505134
diff --git a/metadata/md5-cache/dev-python/pyjwt-1.5.3 b/metadata/md5-cache/dev-python/pyjwt-1.5.3
index 5b5f9bf356e2..730d6c63ebfe 100644
--- a/metadata/md5-cache/dev-python/pyjwt-1.5.3
+++ b/metadata/md5-cache/dev-python/pyjwt-1.5.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyJWT/PyJWT-1.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77bfd96e3d11ec50b948dad77deab220
+_md5_=060f7d011e7fde7c1202d1f2c542c419
diff --git a/metadata/md5-cache/dev-python/pyjwt-1.7.1 b/metadata/md5-cache/dev-python/pyjwt-1.7.1
index 241333aa020d..a8f9008cb549 100644
--- a/metadata/md5-cache/dev-python/pyjwt-1.7.1
+++ b/metadata/md5-cache/dev-python/pyjwt-1.7.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyJWT/PyJWT-1.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea71712c034f1c400c5897c9465b9ef9
+_md5_=a4cf6234f6368d65a7fdbf5c073506c0
diff --git a/metadata/md5-cache/dev-python/pykka-1.2.1 b/metadata/md5-cache/dev-python/pykka-1.2.1
index 7a2d04ba77aa..bc63454b396e 100644
--- a/metadata/md5-cache/dev-python/pykka-1.2.1
+++ b/metadata/md5-cache/dev-python/pykka-1.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pykka/Pykka-1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f6bf24700e57570e4d2a8caf90632aa
+_md5_=3267e05857babf9692ce9f5715d4abd9
diff --git a/metadata/md5-cache/dev-python/pykwalify-1.5.2 b/metadata/md5-cache/dev-python/pykwalify-1.5.2
index a547ed4a2391..60ee4e17e4fb 100644
--- a/metadata/md5-cache/dev-python/pykwalify-1.5.2
+++ b/metadata/md5-cache/dev-python/pykwalify-1.5.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/docopt-0.6.2 >=dev-python/pyyaml-3.11 >=dev-python/python-dateutil-2.4.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pykwalify/pykwalify-1.5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a4a3430f9eeb80c606ef078fceb2621
+_md5_=232291a62b9059f63a8a3abf3169bd27
diff --git a/metadata/md5-cache/dev-python/pykwalify-9999 b/metadata/md5-cache/dev-python/pykwalify-9999
index 5eb86caa991e..75f331003abb 100644
--- a/metadata/md5-cache/dev-python/pykwalify-9999
+++ b/metadata/md5-cache/dev-python/pykwalify-9999
@@ -9,6 +9,7 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-python/docopt-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3fb9050e7ee65349d8f38bd8ea5f0ea9
+_md5_=771b7df7608c89e6a56f11ec9d959b14
diff --git a/metadata/md5-cache/dev-python/pylibmc-1.5.1-r1 b/metadata/md5-cache/dev-python/pylibmc-1.5.1-r1
index 54621c65b679..dc4d802d3650 100644
--- a/metadata/md5-cache/dev-python/pylibmc-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/pylibmc-1.5.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libmemcached-0.32 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lericson/pylibmc/archive/1.5.1.tar.gz -> pylibmc-1.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7f1deac8128a3c4f7b51f9e6d4ad4271
+_md5_=8aa7f52a1a13c0dda0eeb99eb518da45
diff --git a/metadata/md5-cache/dev-python/pylint-1.8.4 b/metadata/md5-cache/dev-python/pylint-1.8.4
index 60d2b273298d..ef42be644d92 100644
--- a/metadata/md5-cache/dev-python/pylint-1.8.4
+++ b/metadata/md5-cache/dev-python/pylint-1.8.4
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linu
 LICENSE=GPL-2
 RDEPEND=>=dev-python/astroid-1.6.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/isort-4.2.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mccabe[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-singledispatch[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configparser[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-1.8.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60e2ee37ccc082dd98dcdba493ce5dad
+_md5_=dc9b301a2036b3cc7f7f0ed02c90934c
diff --git a/metadata/md5-cache/dev-python/pylint-2.3.1 b/metadata/md5-cache/dev-python/pylint-2.3.1
index ebafd858320a..f8585e1e3bf2 100644
--- a/metadata/md5-cache/dev-python/pylint-2.3.1
+++ b/metadata/md5-cache/dev-python/pylint-2.3.1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/astroid-2.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/isort-4.2.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mccabe[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-2.3.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4ca07064b0411c10febbb8036f5b73b2
+_md5_=ad0e907f1cef0a8d21eb2a3a568171a6
diff --git a/metadata/md5-cache/dev-python/pymediainfo-4.0 b/metadata/md5-cache/dev-python/pymediainfo-4.0
index c83e80526649..2df9dcf7f277 100644
--- a/metadata/md5-cache/dev-python/pymediainfo-4.0
+++ b/metadata/md5-cache/dev-python/pymediainfo-4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-libs/libmediainfo python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-4.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=050bbde83ed1e3f0a145d157c7f7d48c
+_md5_=bcc433548d45238657aaee9e9ee6fb49
diff --git a/metadata/md5-cache/dev-python/pymediainfo-4.1 b/metadata/md5-cache/dev-python/pymediainfo-4.1
index f0ddec7955d8..7b38c2714dcb 100644
--- a/metadata/md5-cache/dev-python/pymediainfo-4.1
+++ b/metadata/md5-cache/dev-python/pymediainfo-4.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-libs/libmediainfo python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-4.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=050bbde83ed1e3f0a145d157c7f7d48c
+_md5_=bcc433548d45238657aaee9e9ee6fb49
diff --git a/metadata/md5-cache/dev-python/pympler-0.5 b/metadata/md5-cache/dev-python/pympler-0.5
index c1947c58b17e..f2a1034a2765 100644
--- a/metadata/md5-cache/dev-python/pympler-0.5
+++ b/metadata/md5-cache/dev-python/pympler-0.5
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/bottle[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pympler/pympler/archive/0.5.tar.gz -> pympler-0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ceb1c7c427b1c87c5095e46934fca0db
+_md5_=13bf78f73fc5804aae8046563a36572d
diff --git a/metadata/md5-cache/dev-python/pympler-0.6 b/metadata/md5-cache/dev-python/pympler-0.6
index 4e33133ceb14..075485fe5eeb 100644
--- a/metadata/md5-cache/dev-python/pympler-0.6
+++ b/metadata/md5-cache/dev-python/pympler-0.6
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linu
 LICENSE=Apache-2.0
 RDEPEND=dev-python/bottle[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pympler/pympler/archive/0.6.tar.gz -> pympler-0.6.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2f7b548a9a9113e8f388e3880a0c2c59
+_md5_=53044d92f2671ebaeb7a53430f5f3c5a
diff --git a/metadata/md5-cache/dev-python/pynacl-1.2.1 b/metadata/md5-cache/dev-python/pynacl-1.2.1
index 63ff3351eb3b..5b3faf3e3724 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.2.1
+++ b/metadata/md5-cache/dev-python/pynacl-1.2.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/libsodium:0/23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.2.1.tar.gz -> pynacl-1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80b289e667ae4659336fed435df741b8
+_md5_=e2a660a8141f79da8e8874f3a4ee3c37
diff --git a/metadata/md5-cache/dev-python/pynacl-1.3.0 b/metadata/md5-cache/dev-python/pynacl-1.3.0
index 9fb2603e76ef..0b810c4e25e8 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.3.0
+++ b/metadata/md5-cache/dev-python/pynacl-1.3.0
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~am
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libsodium:0/23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.3.0.tar.gz -> pynacl-1.3.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4cb29bc133f6d20129df1472177d2b38
+_md5_=6208260aa5e0f1a2c0046453c884505e
diff --git a/metadata/md5-cache/dev-python/pynag-0.9.1 b/metadata/md5-cache/dev-python/pynag-0.9.1
index ad0ef1fcc51e..9f983eb285da 100644
--- a/metadata/md5-cache/dev-python/pynag-0.9.1
+++ b/metadata/md5-cache/dev-python/pynag-0.9.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pynag/pynag-0.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69efab5968f3cdc2ad1162767b0b229a
+_md5_=f8e59c1b57e0a80bbf405a113fc0d256
diff --git a/metadata/md5-cache/dev-python/pyoembed-0.1.1 b/metadata/md5-cache/dev-python/pyoembed-0.1.1
index ecd51bde885c..0d8e6882a049 100644
--- a/metadata/md5-cache/dev-python/pyoembed-0.1.1
+++ b/metadata/md5-cache/dev-python/pyoembed-0.1.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyoembed/pyoembed-0.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5ea8c614eda99d18dfed2a0d41b7c0a
+_md5_=e6d97427cfea95c7b0fd5c7e5a9c4b49
diff --git a/metadata/md5-cache/dev-python/pyoembed-9999 b/metadata/md5-cache/dev-python/pyoembed-9999
index 364f16abdbe6..e68d1ce7478f 100644
--- a/metadata/md5-cache/dev-python/pyoembed-9999
+++ b/metadata/md5-cache/dev-python/pyoembed-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5ea8c614eda99d18dfed2a0d41b7c0a
+_md5_=e6d97427cfea95c7b0fd5c7e5a9c4b49
diff --git a/metadata/md5-cache/dev-python/pyparted-3.10.7 b/metadata/md5-cache/dev-python/pyparted-3.10.7
index ce613e9bcf23..dc61fdc0980a 100644
--- a/metadata/md5-cache/dev-python/pyparted-3.10.7
+++ b/metadata/md5-cache/dev-python/pyparted-3.10.7
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=test? ( python_targets_python2_7 ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pyparted/archive/v3.10.7.tar.gz -> pyparted-3.10.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9444e5972ecb0074d36a39574f053d2
+_md5_=d6a444f95db160ff07ccad6d1d68519c
diff --git a/metadata/md5-cache/dev-python/pyparted-3.11.2 b/metadata/md5-cache/dev-python/pyparted-3.11.2
index e937eee7f5a3..93757e83d225 100644
--- a/metadata/md5-cache/dev-python/pyparted-3.11.2
+++ b/metadata/md5-cache/dev-python/pyparted-3.11.2
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=test? ( python_targets_python2_7 ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pyparted/archive/v3.11.2.tar.gz -> pyparted-3.11.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=37919432c5a1b69df84f75cd84bd183f
+_md5_=d13f0388f5b882d05885d51fdf2d834f
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.13 b/metadata/md5-cache/dev-python/pyquery-1.2.13
index a7987677ad51..80ea053fd9c8 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.2.13
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.13
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2a1bfedc4d167f1062a70b5fc826190
+_md5_=4dcc7b9a13f0c3b38b4b0678249ae246
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.13-r1 b/metadata/md5-cache/dev-python/pyquery-1.2.13-r1
index a53249c4d2e2..b7f8b1579138 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.2.13-r1
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.13-r1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.13.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4cd5c91f4362bcdd811d21f43b8386a6
+_md5_=af2f1e7f302ac4b993d20d8b75f2b116
diff --git a/metadata/md5-cache/dev-python/pyquery-1.4.0 b/metadata/md5-cache/dev-python/pyquery-1.4.0
index 5bf998128893..ca00179b8b9c 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.4.0
+++ b/metadata/md5-cache/dev-python/pyquery-1.4.0
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.4.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a962d09c2bd338e81939b70d11be119e
+_md5_=d26245cfd8d4888a5aaa22f2b77ff311
diff --git a/metadata/md5-cache/dev-python/pyrax-1.9.7 b/metadata/md5-cache/dev-python/pyrax-1.9.7
index 29eb903997dd..2e4694c83e9f 100644
--- a/metadata/md5-cache/dev-python/pyrax-1.9.7
+++ b/metadata/md5-cache/dev-python/pyrax-1.9.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rackspace-novaclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrax/pyrax-1.9.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd49c0b28f0b7bd9bafcc316f43fabd5
+_md5_=4cc90ca5baefdc48d86ec578c60e8e4f
diff --git a/metadata/md5-cache/dev-python/pyregion-1.2 b/metadata/md5-cache/dev-python/pyregion-1.2
index 751ec1220a5b..3763c7d62709 100644
--- a/metadata/md5-cache/dev-python/pyregion-1.2
+++ b/metadata/md5-cache/dev-python/pyregion-1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyregion/pyregion-1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b21c5694f6a25bc3fd9b346c5037e788
+_md5_=19abadb41eaf96437739256509053bd2
diff --git a/metadata/md5-cache/dev-python/pyrfc3339-1.0 b/metadata/md5-cache/dev-python/pyrfc3339-1.0
index 992a2c83f91a..9acaf67bbd82 100644
--- a/metadata/md5-cache/dev-python/pyrfc3339-1.0
+++ b/metadata/md5-cache/dev-python/pyrfc3339-1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyRFC3339/pyRFC3339-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94dc05dcafcf8e0187f5cd6e12ada9ad
+_md5_=a9dcc98b66e90b5d96e4c69bea8e31e6
diff --git a/metadata/md5-cache/dev-python/pyrfc3339-1.1 b/metadata/md5-cache/dev-python/pyrfc3339-1.1
index 261307957e9b..657cb4ab4fbc 100644
--- a/metadata/md5-cache/dev-python/pyrfc3339-1.1
+++ b/metadata/md5-cache/dev-python/pyrfc3339-1.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyRFC3339/pyRFC3339-1.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e62909f17ca9aa73f211e5f38c05cd89
+_md5_=a086d0aad34d334d41661168473cd7f0
diff --git a/metadata/md5-cache/dev-python/pyro-4.41 b/metadata/md5-cache/dev-python/pyro-4.41
index ac30e22de2c0..e6dd912d1097 100644
--- a/metadata/md5-cache/dev-python/pyro-4.41
+++ b/metadata/md5-cache/dev-python/pyro-4.41
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!dev-python/pyro:0 >=dev-python/serpent-1.11[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.41.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1bef2b950ffb84da851585470db09266
+_md5_=69e1d467bd7e8bfcd18d1699503d952f
diff --git a/metadata/md5-cache/dev-python/pyro-4.56 b/metadata/md5-cache/dev-python/pyro-4.56
index 76ed277e972a..9f1ef345d668 100644
--- a/metadata/md5-cache/dev-python/pyro-4.56
+++ b/metadata/md5-cache/dev-python/pyro-4.56
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 ppc x86
 LICENSE=MIT
 RDEPEND=!dev-python/pyro:0 python_targets_python2_7? ( dev-python/selectors34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/serpent-1.19[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.56.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ca663e71fcc965082ba11f0fc43517ed
+_md5_=ace83f46e2a5cfa4030f8cfe36653df4
diff --git a/metadata/md5-cache/dev-python/pyrqlite-2.0 b/metadata/md5-cache/dev-python/pyrqlite-2.0
index e7005bc97485..13acd7f063e2 100644
--- a/metadata/md5-cache/dev-python/pyrqlite-2.0
+++ b/metadata/md5-cache/dev-python/pyrqlite-2.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rqlite/pyrqlite/archive/v2.0.tar.gz -> pyrqlite-2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=387e0686d5f18a2864db442eabec1a0f
+_md5_=29315c35cf60a30aeec8e9085ead701e
diff --git a/metadata/md5-cache/dev-python/pyrqlite-9999 b/metadata/md5-cache/dev-python/pyrqlite-9999
index 6dae30d108e2..edc955bb1f20 100644
--- a/metadata/md5-cache/dev-python/pyrqlite-9999
+++ b/metadata/md5-cache/dev-python/pyrqlite-9999
@@ -8,6 +8,7 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=745e00fe818cf77a8df0d22ef0670408
+_md5_=15e6b67049d8b3b86ec1f99f329507e2
diff --git a/metadata/md5-cache/dev-python/pyscaffold-2.4.4 b/metadata/md5-cache/dev-python/pyscaffold-2.4.4
index a13d3cbeab25..c259264d2b00 100644
--- a/metadata/md5-cache/dev-python/pyscaffold-2.4.4
+++ b/metadata/md5-cache/dev-python/pyscaffold-2.4.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyScaffold/pyscaffold-2.4.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb96bf4cf2f9386b6de4efb1e49536d2
+_md5_=12ed55e910f0918f172aa6f8f45a9a40
diff --git a/metadata/md5-cache/dev-python/pyshark-0.3.7.2-r1 b/metadata/md5-cache/dev-python/pyshark-0.3.7.2-r1
index 0c80550eee48..29f2810793fa 100644
--- a/metadata/md5-cache/dev-python/pyshark-0.3.7.2-r1
+++ b/metadata/md5-cache/dev-python/pyshark-0.3.7.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/logbook[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/trollius[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-analyzer/wireshark[tshark] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KimiNewt/pyshark/archive/v0.3.7.2.tar.gz -> pyshark-0.3.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a181a02bb6017d5ec0885161f31c79c
+_md5_=bbd6671b3b2cbfb204f28081d8e3d710
diff --git a/metadata/md5-cache/dev-python/pyshark-0.4.2.3 b/metadata/md5-cache/dev-python/pyshark-0.4.2.3
index bce5e97df8bf..9d379a6e06e6 100644
--- a/metadata/md5-cache/dev-python/pyshark-0.4.2.3
+++ b/metadata/md5-cache/dev-python/pyshark-0.4.2.3
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/py[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/logbook[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/trollius[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-analyzer/wireshark[tshark] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KimiNewt/pyshark/archive/v0.4.2.3.tar.gz -> pyshark-0.4.2.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=58d76f1d8e3eb7c09a971dd3f1b9ed8c
+_md5_=f215ca37fded1f436a621b1d6b25dc6e
diff --git a/metadata/md5-cache/dev-python/pyspf-2.0.12 b/metadata/md5-cache/dev-python/pyspf-2.0.12
index 9bc64d02691b..a36a5e550e2d 100644
--- a/metadata/md5-cache/dev-python/pyspf-2.0.12
+++ b/metadata/md5-cache/dev-python/pyspf-2.0.12
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=PSF-2
 RDEPEND=dev-python/authres[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddr-2.1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pydns:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_5? ( dev-python/pydns:3[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/pydns:3[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6?] ) python_targets_python3_5? ( dev-lang/python:3.5[ipv6?] ) python_targets_python3_6? ( dev-lang/python:3.6[ipv6?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=test? ( ipv6 ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyspf/pyspf-2.0.12t.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=edcb4bab5ac913b2fad67dac901b0b89
+_md5_=b12adf51a326526769601904710c9428
diff --git a/metadata/md5-cache/dev-python/pysrt-1.1.1 b/metadata/md5-cache/dev-python/pysrt-1.1.1
index f5feec554bd3..95c8f243df07 100644
--- a/metadata/md5-cache/dev-python/pysrt-1.1.1
+++ b/metadata/md5-cache/dev-python/pysrt-1.1.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pypi.python.org/packages/f6/33/16ad65a8973cb8bcb494af09ee1b9ab5ffdd6ff300bce5d3ac7d3cb1f2cc/pysrt-1.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d37bffd6d1a9d57a4f3beeb0a388f26f
+_md5_=ad077a1068aa90cd476155ab1214e72f
diff --git a/metadata/md5-cache/dev-python/pysrt-1.1.1-r1 b/metadata/md5-cache/dev-python/pysrt-1.1.1-r1
index 8a4b369a142d..e5a1b5e73d26 100644
--- a/metadata/md5-cache/dev-python/pysrt-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/pysrt-1.1.1-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/chardet[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysrt/pysrt-1.1.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9e279345062a013c7192d7d77a78a1f8
+_md5_=55f387ee37dd20c1dec0d8c439b9e929
diff --git a/metadata/md5-cache/dev-python/pysrt-9999 b/metadata/md5-cache/dev-python/pysrt-9999
index e1a6c8896f93..710fc0cbfcf3 100644
--- a/metadata/md5-cache/dev-python/pysrt-9999
+++ b/metadata/md5-cache/dev-python/pysrt-9999
@@ -9,6 +9,7 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=dev-python/chardet[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9e279345062a013c7192d7d77a78a1f8
+_md5_=55f387ee37dd20c1dec0d8c439b9e929
diff --git a/metadata/md5-cache/dev-python/pystache-0.5.4 b/metadata/md5-cache/dev-python/pystache-0.5.4
index 7446390f23a9..d5b890190753 100644
--- a/metadata/md5-cache/dev-python/pystache-0.5.4
+++ b/metadata/md5-cache/dev-python/pystache-0.5.4
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pystache/pystache-0.5.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11dc6e7bcdb742025aef30f7b40f4227
+_md5_=f110f367fdfe769facd50897612266e1
diff --git a/metadata/md5-cache/dev-python/pytables-3.4.4 b/metadata/md5-cache/dev-python/pytables-3.4.4
index a6814c8d8201..2461bfe95e71 100644
--- a/metadata/md5-cache/dev-python/pytables-3.4.4
+++ b/metadata/md5-cache/dev-python/pytables-3.4.4
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= dev-libs/lzo:2= >=dev-python/numpy-1.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numexpr-2.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-libs/hdf5-1.8.15:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tables/tables-3.4.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71b2b89d06ea1f2c7fa1ee41dce92564
+_md5_=989e2ba00d55ea243ad0b415e3ad3753
diff --git a/metadata/md5-cache/dev-python/pyte-0.5.2-r2 b/metadata/md5-cache/dev-python/pyte-0.5.2-r2
index f245407c3700..0fdcd560a326 100644
--- a/metadata/md5-cache/dev-python/pyte-0.5.2-r2
+++ b/metadata/md5-cache/dev-python/pyte-0.5.2-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyte/pyte-0.5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=328554fe12cc3cc28ed4779caa3979b8
+_md5_=f913c37e82c7f50e7a07c58cccba28f2
diff --git a/metadata/md5-cache/dev-python/pyte-0.8.0-r1 b/metadata/md5-cache/dev-python/pyte-0.8.0-r1
index f9039556e54e..19549af18add 100644
--- a/metadata/md5-cache/dev-python/pyte-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/pyte-0.8.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/selectel/pyte/archive/0.8.0.tar.gz -> pyte-0.8.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5153d6e3d299c9cf5cb951d16f573e9d
+_md5_=b6765f04e5e9f58342c8111e4c64d905
diff --git a/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2 b/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
index 60ddaf14170c..ee694c9e43f0 100644
--- a/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
+++ b/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/py-1.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !dev-python/pytest-capturelog python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-catchlog/pytest-catchlog-1.2.2.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4b6e25777719ff409a84a09091843d0b
+_md5_=10effe5fc51b3c50f4704027d3dc6a98
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.3.1 b/metadata/md5-cache/dev-python/pytest-cov-2.3.1
index f154a40eb049..0fd1da0b49dd 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.3.1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.3.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.7.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cov-core-1.14.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-3.7.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7f8ae26ac24722947db0f749da8b8fb3
+_md5_=d60565e1aa5112f432fe1b762a9bb388
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.6.1 b/metadata/md5-cache/dev-python/pytest-cov-2.6.1
index e2811169573e..b962e8bed6d1 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.6.1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.6.1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.6.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c286dc3b81ac4be82cc64e0683eecac7
+_md5_=1dc8b25ce5f56ed54178177e158e9bf1
diff --git a/metadata/md5-cache/dev-python/pytest-datafiles-2.0 b/metadata/md5-cache/dev-python/pytest-datafiles-2.0
index 2e428726a268..817cb2f708df 100644
--- a/metadata/md5-cache/dev-python/pytest-datafiles-2.0
+++ b/metadata/md5-cache/dev-python/pytest-datafiles-2.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-3.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/omarkohl/pytest-datafiles/archive/2.0/pytest-datafiles-2.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=90d455fe6bd8be134e37b18338c3bbfb
+_md5_=86c1d211e1fcf2191b815b78c60bf3e3
diff --git a/metadata/md5-cache/dev-python/pytest-flakes-4.0.0 b/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
index dcc81612e8b2..d4fdd3f1e1e0 100644
--- a/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
+++ b/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-flakes/pytest-flakes-4.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ee25ab0544e13ecf24ec0d801058b914
+_md5_=8c02328caeb7e41d84d8214963eed154
diff --git a/metadata/md5-cache/dev-python/pytest-localserver-0.3.7 b/metadata/md5-cache/dev-python/pytest-localserver-0.3.7
index 8461d8d92b31..4a5e2fa5820f 100644
--- a/metadata/md5-cache/dev-python/pytest-localserver-0.3.7
+++ b/metadata/md5-cache/dev-python/pytest-localserver-0.3.7
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/werkzeug-0.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-localserver/pytest-localserver-0.3.7.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=53d3e7ee5b124840dbb044a5e3346601
+_md5_=dded4349d46f376e267af8c4bbde2876
diff --git a/metadata/md5-cache/dev-python/pytest-pylint-0.14.1 b/metadata/md5-cache/dev-python/pytest-pylint-0.14.1
index d02f5b923985..3159eca44536 100644
--- a/metadata/md5-cache/dev-python/pytest-pylint-0.14.1
+++ b/metadata/md5-cache/dev-python/pytest-pylint-0.14.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pylint[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/carsongee/pytest-pylint/archive/0.14.1.tar.gz -> pytest-pylint-0.14.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=38396c3c29a4b34189ec1ac1196645a4
+_md5_=825a9c9523e51a776eb7c7479c923267
diff --git a/metadata/md5-cache/dev-python/pytest-pylint-0.7.1 b/metadata/md5-cache/dev-python/pytest-pylint-0.7.1
index 28236525e7a9..5255ef303ea8 100644
--- a/metadata/md5-cache/dev-python/pytest-pylint-0.7.1
+++ b/metadata/md5-cache/dev-python/pytest-pylint-0.7.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/carsongee/pytest-pylint/archive/v0.7.1.tar.gz -> pytest-pylint-0.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8660a01eed7155d8e7150e27c779b467
+_md5_=333df24cdc6170b5c339e793720f02e0
diff --git a/metadata/md5-cache/dev-python/pytest-runner-2.11.1 b/metadata/md5-cache/dev-python/pytest-runner-2.11.1
index 5e6b42b4d39c..b4437344d5df 100644
--- a/metadata/md5-cache/dev-python/pytest-runner-2.11.1
+++ b/metadata/md5-cache/dev-python/pytest-runner-2.11.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-runner/pytest-runner-2.11.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07cbc0a59bd47ebb342642b1245e618e
+_md5_=397f6b644c05ccb3eec2d3899332d66b
diff --git a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1 b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
index 6d55c9067557..137cab35e27c 100644
--- a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
+++ b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=public-domain
 RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/untitaker/pytest-subtesthack/archive/0.1.1.tar.gz -> pytest-subtesthack-0.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=561cd12297547f4b9bcd569eb3e472c0
+_md5_=83d513674889c6b245fc15333625439f
diff --git a/metadata/md5-cache/dev-python/pytest-testmon-0.9.15 b/metadata/md5-cache/dev-python/pytest-testmon-0.9.15
index e31a63724960..dfb3e4073651 100644
--- a/metadata/md5-cache/dev-python/pytest-testmon-0.9.15
+++ b/metadata/md5-cache/dev-python/pytest-testmon-0.9.15
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-testmon/pytest-testmon-0.9.15.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=140e15f5f2ebde130fcc844a476769d5
+_md5_=e41a44472b52cc90b3d6af6ad59f6cff
diff --git a/metadata/md5-cache/dev-python/python-afl-0.6.1 b/metadata/md5-cache/dev-python/python-afl-0.6.1
index 017bffbaceec..9efb02910719 100644
--- a/metadata/md5-cache/dev-python/python-afl-0.6.1
+++ b/metadata/md5-cache/dev-python/python-afl-0.6.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=app-forensics/afl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-afl/python-afl-0.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c28005e8805bafd7c02b028fba88666
+_md5_=0489dec5c726d012709f10e7e9fc133c
diff --git a/metadata/md5-cache/dev-python/python-afl-0.7.1 b/metadata/md5-cache/dev-python/python-afl-0.7.1
index b61fc28926d2..81579c822b74 100644
--- a/metadata/md5-cache/dev-python/python-afl-0.7.1
+++ b/metadata/md5-cache/dev-python/python-afl-0.7.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=app-forensics/afl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-afl/python-afl-0.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c28005e8805bafd7c02b028fba88666
+_md5_=0489dec5c726d012709f10e7e9fc133c
diff --git a/metadata/md5-cache/dev-python/python-bugzilla-2.1.0 b/metadata/md5-cache/dev-python/python-bugzilla-2.1.0
index 2a5a7718e877..e2575ae0ab05 100644
--- a/metadata/md5-cache/dev-python/python-bugzilla-2.1.0
+++ b/metadata/md5-cache/dev-python/python-bugzilla-2.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=|| ( dev-python/python-magic[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/file[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-bugzilla/python-bugzilla-2.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de9a6121050d38fbf40e16d639829e6e
+_md5_=93a2672d48f3b32a123a745819416df1
diff --git a/metadata/md5-cache/dev-python/python-daemon-1.6-r1 b/metadata/md5-cache/dev-python/python-daemon-1.6-r1
index 605f45951179..b48dd353502f 100644
--- a/metadata/md5-cache/dev-python/python-daemon-1.6-r1
+++ b/metadata/md5-cache/dev-python/python-daemon-1.6-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=PSF-2
 RDEPEND=>=dev-python/lockfile-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-daemon/python-daemon-1.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c961bdd5005e5211210b529a58c30f7
+_md5_=e041479af6499bae67c79b3183edc9bf
diff --git a/metadata/md5-cache/dev-python/python-daemon-2.1.1 b/metadata/md5-cache/dev-python/python-daemon-2.1.1
index e11b1b060ec4..5f2d2529d1be 100644
--- a/metadata/md5-cache/dev-python/python-daemon-2.1.1
+++ b/metadata/md5-cache/dev-python/python-daemon-2.1.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=PSF-2
 RDEPEND=>=dev-python/lockfile-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-daemon/python-daemon-2.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa583a7dd90dc8ea79a1e9b0b0ca4f3b
+_md5_=f2ace5d66515b69551e7d23a0eb87442
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.1 b/metadata/md5-cache/dev-python/python-dateutil-2.7.1
index 46857468ffac..4f3a6272bf7b 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.7.1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/timezone-data python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4264164c9bff7621b5bf47def8379e5a
+_md5_=037e14485da001440cfe729a3186dcb7
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.2 b/metadata/md5-cache/dev-python/python-dateutil-2.7.2
index 8a47a8e6aa3b..24ee54dfa6d5 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.7.2
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.2
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/timezone-data python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4264164c9bff7621b5bf47def8379e5a
+_md5_=037e14485da001440cfe729a3186dcb7
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1 b/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1
index 9f4bc2303789..5256973d108b 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-libs/timezone-data python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5ba254ca114de099309a6badbb2a639
+_md5_=57dc5950f810797bc8719944c443fa9c
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.3 b/metadata/md5-cache/dev-python/python-dateutil-2.7.3
index 0103a04683c3..1a3393d91745 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.7.3
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.3
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-libs/timezone-data python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.7.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1ae316ed9a88c6cdaba66a085faf661
+_md5_=e9bfd3eb7e1fbbc7d02d3b32b444035d
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.4 b/metadata/md5-cache/dev-python/python-dateutil-2.7.4
index de0da88cb576..6d437e02bf3a 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.7.4
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.4
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-libs/timezone-data python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.7.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75dce6d090631e0ccb872465c93691a7
+_md5_=3041402d2f96258ef5c81733dd8eb15a
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.5 b/metadata/md5-cache/dev-python/python-dateutil-2.7.5
index ef3a0989b4fe..484f1365bacc 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.7.5
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.5
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-libs/timezone-data python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.7.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75dce6d090631e0ccb872465c93691a7
+_md5_=3041402d2f96258ef5c81733dd8eb15a
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.8.0 b/metadata/md5-cache/dev-python/python-dateutil-2.8.0
index 5f313ef734db..6d26898b7a9c 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.8.0
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.8.0
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-libs/timezone-data python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.8.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d416148f73b280ff86cd07bdadb47917
+_md5_=34021bf93282639d8ac970b99ca87aa9
diff --git a/metadata/md5-cache/dev-python/python-digest-1.7-r1 b/metadata/md5-cache/dev-python/python-digest-1.7-r1
index 579f3e34afb5..e4fac9cea0ca 100644
--- a/metadata/md5-cache/dev-python/python-digest-1.7-r1
+++ b/metadata/md5-cache/dev-python/python-digest-1.7-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-digest/python-digest-1.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=31ed92c599fb741cff7616bb8e21f70b
+_md5_=9bb0d9bdacd4a20250bdf3ca9267fb38
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.39 b/metadata/md5-cache/dev-python/python-distutils-extra-2.39
index f7f0e6552231..7314da5fab91 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.39
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.39
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/python-distutils-extra/trunk/2.39/+download/python-distutils-extra-2.39.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d6a7a5a445172db989d511c9a70e566
+_md5_=f618dae818e714a6984121d590f81749
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.42 b/metadata/md5-cache/dev-python/python-distutils-extra-2.42
index 922e2e80537b..e60e0c3fa263 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.42
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.42
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/p/python-distutils-extra/python-distutils-extra_2.42.tar.xz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=30e18ca523d353d951b93a28104c3a0a
+_md5_=f1ce5ed90b0f1d3ea0440ddda0efd524
diff --git a/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1 b/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
index deeb89c76305..5430e0518b14 100644
--- a/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
+++ b/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/dnspython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/urllib3-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-etcd/python-etcd-0.4.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99d40fa2f74dd53e96ff8e512f3b7644
+_md5_=683ee16cac08f541199a148693dbe494
diff --git a/metadata/md5-cache/dev-python/python-fastimport-0.9.2-r1 b/metadata/md5-cache/dev-python/python-fastimport-0.9.2-r1
index c14bd202aab0..bc7d2ceba3ee 100644
--- a/metadata/md5-cache/dev-python/python-fastimport-0.9.2-r1
+++ b/metadata/md5-cache/dev-python/python-fastimport-0.9.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/python-fastimport/trunk/0.9.2/+download/python-fastimport-0.9.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=73fe3a0698caa454ab9a8a5ce5eb48fd
+_md5_=bfadb3d2217156d7294bd99a05e30b8b
diff --git a/metadata/md5-cache/dev-python/python-fastimport-0.9.6 b/metadata/md5-cache/dev-python/python-fastimport-0.9.6
index b72fa248e56b..0304fc50cee0 100644
--- a/metadata/md5-cache/dev-python/python-fastimport-0.9.6
+++ b/metadata/md5-cache/dev-python/python-fastimport-0.9.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-maco
 LICENSE=GPL-2+
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fastimport/fastimport-0.9.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82e7542b2ba425e8c22f2dbbd8fabd64
+_md5_=467a7203dc84f2c63f347416c153a2cb
diff --git a/metadata/md5-cache/dev-python/python-fastimport-0.9.8 b/metadata/md5-cache/dev-python/python-fastimport-0.9.8
index 7101d2d85abb..7fd6b2ea1c69 100644
--- a/metadata/md5-cache/dev-python/python-fastimport-0.9.8
+++ b/metadata/md5-cache/dev-python/python-fastimport-0.9.8
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-ma
 LICENSE=GPL-2+
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fastimport/fastimport-0.9.8.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=81d13f015a2bf0fb2eebfdcd4814fd06
+_md5_=b0db9cb6176f7226167dd40d56745686
diff --git a/metadata/md5-cache/dev-python/python-gammu-2.11 b/metadata/md5-cache/dev-python/python-gammu-2.11
index 5b23ac0586a0..31c8387b2068 100644
--- a/metadata/md5-cache/dev-python/python-gammu-2.11
+++ b/metadata/md5-cache/dev-python/python-gammu-2.11
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-mobilephone/gammu-1.34.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gammu/python-gammu-2.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ffb707e47cabe0733d25a626661bbe33
+_md5_=805de99fb5d75f121cc975a1cbb2f4b6
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-2.13.1 b/metadata/md5-cache/dev-python/python-glanceclient-2.13.1
index 20ae5e3418d2..007637358f27 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-2.13.1
+++ b/metadata/md5-cache/dev-python/python-glanceclient-2.13.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/warlock-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/warlock-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wrapt-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-2.13.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=885b8887613bf1de146acb1c50d3e980
+_md5_=7336aa4ea2adfcba55ba3778854fd9fa
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-2.16.0 b/metadata/md5-cache/dev-python/python-glanceclient-2.16.0
index bda3b6f17afc..90b1aac06026 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-2.16.0
+++ b/metadata/md5-cache/dev-python/python-glanceclient-2.16.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/warlock-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/warlock-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wrapt-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-2.16.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0bde42dd14013b4bc09062b0bcbc90cb
+_md5_=1484bf39bba5e135a0e8050068dc6684
diff --git a/metadata/md5-cache/dev-python/python-heatclient-1.16.2 b/metadata/md5-cache/dev-python/python-heatclient-1.16.2
index d154096f17f2..688d91d07c3a 100644
--- a/metadata/md5-cache/dev-python/python-heatclient-1.16.2
+++ b/metadata/md5-cache/dev-python/python-heatclient-1.16.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/cliff-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osc-lib-1.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-heatclient/python-heatclient-1.16.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a03734cd555181bb74103a12cd3d82fe
+_md5_=8a62090fc8881faa1a7ffeb61ff2e6f3
diff --git a/metadata/md5-cache/dev-python/python-heatclient-1.17.0 b/metadata/md5-cache/dev-python/python-heatclient-1.17.0
index c4ab575a583a..cb3abcfe06e1 100644
--- a/metadata/md5-cache/dev-python/python-heatclient-1.17.0
+++ b/metadata/md5-cache/dev-python/python-heatclient-1.17.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/cliff-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osc-lib-1.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-heatclient/python-heatclient-1.17.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5845e9afc5cb2ff0f115af15557931ee
+_md5_=c5c2bbf403cf25d7cb2a811fa5e17cb1
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-1.17.0 b/metadata/md5-cache/dev-python/python-ironicclient-1.17.0
index af2369d98283..6d72df709b68 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-1.17.0
+++ b/metadata/md5-cache/dev-python/python-ironicclient-1.17.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osc-lib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-openstackclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/python-openstackclient-3.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-1.17.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=659c63e9fcdf10cc8eb14cb5b5bb3603
+_md5_=6a33e6a64f7bdba3bb4acf568bfaafa0
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-2.2.1 b/metadata/md5-cache/dev-python/python-ironicclient-2.2.1
index 787c75c07700..4a424e651650 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-2.2.1
+++ b/metadata/md5-cache/dev-python/python-ironicclient-2.2.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osc-lib-1.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-2.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d408caa2b24f8f9c2eb8d667f91b784e
+_md5_=5320be2856f6c4214e52721a260ea835
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-2.7.1 b/metadata/md5-cache/dev-python/python-ironicclient-2.7.1
index 8e8c3a35eb67..bb4ba49d102d 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-2.7.1
+++ b/metadata/md5-cache/dev-python/python-ironicclient-2.7.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osc-lib-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-2.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=272bf93cb7c06064fdb070cbf86d0945
+_md5_=203d65cbb743e9732eee5bbc4187f923
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-2.7.2 b/metadata/md5-cache/dev-python/python-ironicclient-2.7.2
index f8f4c65281b2..1ee935dbcafd 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-2.7.2
+++ b/metadata/md5-cache/dev-python/python-ironicclient-2.7.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osc-lib-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-2.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=272bf93cb7c06064fdb070cbf86d0945
+_md5_=203d65cbb743e9732eee5bbc4187f923
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.1.0-r1 b/metadata/md5-cache/dev-python/python-ldap-3.1.0-r1
index 4f3f12c70196..e1e153a70520 100644
--- a/metadata/md5-cache/dev-python/python-ldap-3.1.0-r1
+++ b/metadata/md5-cache/dev-python/python-ldap-3.1.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-solaris
 LICENSE=PSF-2
 RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-3.1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3bce5e9d68da5e65ae8a798e28eaa672
+_md5_=0b0784a068405498f3262e071341f74c
diff --git a/metadata/md5-cache/dev-python/python-ldap-9999 b/metadata/md5-cache/dev-python/python-ldap-9999
index 7f0dbc49aa67..4781bebc55e3 100644
--- a/metadata/md5-cache/dev-python/python-ldap-9999
+++ b/metadata/md5-cache/dev-python/python-ldap-9999
@@ -9,6 +9,7 @@ LICENSE=PSF-2
 PROPERTIES=live
 RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dc75af7f0c14d899e1a76df08a40f75a
+_md5_=ce107d9f3686a007cd98f40fdbd4c0b5
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.11 b/metadata/md5-cache/dev-python/python-lzo-1.11
index d01b8fbb3191..3baf0cab441e 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.11
+++ b/metadata/md5-cache/dev-python/python-lzo-1.11
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lzo/python-lzo-1.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=108cec0bbf3433fcd4d2d4f1e538e6d0
+_md5_=4fe96b7009dc3433d05b61092292a689
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.12 b/metadata/md5-cache/dev-python/python-lzo-1.12
index cac51d4e921f..a5dfecb35cd8 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.12
+++ b/metadata/md5-cache/dev-python/python-lzo-1.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lzo/python-lzo-1.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8c323aa17dee71728ba325d4d1a63c7
+_md5_=79b4ae40d7cf685e26fb5a8133f9d002
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.12-r1 b/metadata/md5-cache/dev-python/python-lzo-1.12-r1
index 2431cd29dfe4..57214f74af4f 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.12-r1
+++ b/metadata/md5-cache/dev-python/python-lzo-1.12-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lzo/python-lzo-1.12.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4375575f359d9d1c912749cc905fbb41
+_md5_=a6b0b3f765b3992a88de5f24a7258811
diff --git a/metadata/md5-cache/dev-python/python-magic-0.4.15-r1 b/metadata/md5-cache/dev-python/python-magic-0.4.15-r1
index 9dde718f61bd..b443b23e0ab8 100644
--- a/metadata/md5-cache/dev-python/python-magic-0.4.15-r1
+++ b/metadata/md5-cache/dev-python/python-magic-0.4.15-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~hppa ~ia64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=sys-apps/file[-python] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ahupp/python-magic/archive/0.4.15.tar.gz -> python-magic-0.4.15.gh.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1b30a975662aa4d4bd55941e448a555f
+_md5_=05cbd30e7145ff5e486a28298a748ee8
diff --git a/metadata/md5-cache/dev-python/python-mpd-0.5.5 b/metadata/md5-cache/dev-python/python-mpd-0.5.5
index bf0c0a0b50ef..932ea54945e3 100644
--- a/metadata/md5-cache/dev-python/python-mpd-0.5.5
+++ b/metadata/md5-cache/dev-python/python-mpd-0.5.5
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Mic92/python-mpd2/archive/v0.5.5.tar.gz -> python-mpd-0.5.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3877662919ac40e6aad2322334d87844
+_md5_=93c2abb00bfafee034995f9fc36558f7
diff --git a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6 b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
index e1a18a0ae6d3..1bc197a4fe21 100644
--- a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
+++ b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD-2 ISC
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alastair/python-musicbrainzngs/archive/v0.6.tar.gz -> python-musicbrainzngs0.6.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5a9bffe11e10b2c2fc21d1be59fbf42b
+_md5_=7b232d791a8b528df002c7f9910ebc34
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-6.12.0 b/metadata/md5-cache/dev-python/python-neutronclient-6.12.0
index b5fec89c8b54..671858dcde85 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-6.12.0
+++ b/metadata/md5-cache/dev-python/python-neutronclient-6.12.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/cliff-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osc-lib-1.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-client-config-1.28.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/simplejson-3.5.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-6.12.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5693936af69556c9e15dc1520f3eaa05
+_md5_=b26d86ade92c3d39f0922d0b17de323b
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-6.9.0 b/metadata/md5-cache/dev-python/python-neutronclient-6.9.0
index cbecf885e636..1da0301b3821 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-6.9.0
+++ b/metadata/md5-cache/dev-python/python-neutronclient-6.9.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/cliff-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osc-lib-1.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-client-config-1.28.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/simplejson-3.5.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-6.9.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=753ff674a6f5f02c511c58484708279e
+_md5_=f026db43fc1cbcbf2ae9ce60d9780c71
diff --git a/metadata/md5-cache/dev-python/python-redmine-2.0.2 b/metadata/md5-cache/dev-python/python-redmine-2.0.2
index 53f5a370a0e2..935884572414 100644
--- a/metadata/md5-cache/dev-python/python-redmine-2.0.2
+++ b/metadata/md5-cache/dev-python/python-redmine-2.0.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-redmine/python-redmine-2.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99c015f18f60261266a2b4e5d3f86e04
+_md5_=40268238438288aa6a1fc078e28b76d3
diff --git a/metadata/md5-cache/dev-python/python-saharaclient-2.2.1 b/metadata/md5-cache/dev-python/python-saharaclient-2.2.1
index 9a24c762979c..df98e8eb7ca0 100644
--- a/metadata/md5-cache/dev-python/python-saharaclient-2.2.1
+++ b/metadata/md5-cache/dev-python/python-saharaclient-2.2.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osc-lib-1.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-openstackclient-3.12.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-saharaclient/python-saharaclient-2.2.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=edb70f2ab3c8b0ccc9d7a183234bcd58
+_md5_=610004c093d513bfcffdc7d6377e2cec
diff --git a/metadata/md5-cache/dev-python/python-sqlparse-0.2.3 b/metadata/md5-cache/dev-python/python-sqlparse-0.2.3
index f9660339f9d6..e964ab36f523 100644
--- a/metadata/md5-cache/dev-python/python-sqlparse-0.2.3
+++ b/metadata/md5-cache/dev-python/python-sqlparse-0.2.3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux
 LICENSE=BSD-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlparse/sqlparse-0.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d7812fabc872a743597cdec2171255b
+_md5_=b503d3c1477a123ebf3e217976c1faa3
diff --git a/metadata/md5-cache/dev-python/python-sqlparse-0.2.4 b/metadata/md5-cache/dev-python/python-sqlparse-0.2.4
index e285270e5029..9d57f891bf66 100644
--- a/metadata/md5-cache/dev-python/python-sqlparse-0.2.4
+++ b/metadata/md5-cache/dev-python/python-sqlparse-0.2.4
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux
 LICENSE=BSD-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlparse/sqlparse-0.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=65b6643ee47f86ee609448702d95f8d9
+_md5_=3489dfeca002329f56c4faf0a4522e25
diff --git a/metadata/md5-cache/dev-python/python-sqlparse-0.3.0 b/metadata/md5-cache/dev-python/python-sqlparse-0.3.0
index 1dc689921836..eea04d25c317 100644
--- a/metadata/md5-cache/dev-python/python-sqlparse-0.3.0
+++ b/metadata/md5-cache/dev-python/python-sqlparse-0.3.0
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~am
 LICENSE=BSD-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlparse/sqlparse-0.3.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=40b24900e11c7483ddef77839b8a7be7
+_md5_=cc915c3c749e1c1ec1dd26ef4d9e4a40
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-3.7.0 b/metadata/md5-cache/dev-python/python-swiftclient-3.7.0
index ef7259b0c9fe..10865e22f88f 100644
--- a/metadata/md5-cache/dev-python/python-swiftclient-3.7.0
+++ b/metadata/md5-cache/dev-python/python-swiftclient-3.7.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-3.7.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=22b5ec4fe7b1c791dcb78e4f6a750878
+_md5_=2e58a297f639068109c77ed510573949
diff --git a/metadata/md5-cache/dev-python/python-systemd-233 b/metadata/md5-cache/dev-python/python-systemd-233
index 4a9d2fc4fe12..c673ec159e2a 100644
--- a/metadata/md5-cache/dev-python/python-systemd-233
+++ b/metadata/md5-cache/dev-python/python-systemd-233
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-apps/systemd:0= !sys-apps/systemd[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/python-systemd/archive/v233.tar.gz -> python-systemd-233.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=624c3c86e6e68e3575b92e0cbf3308a7
+_md5_=8a1e5a5bf029ef6f872cd7b668e00483
diff --git a/metadata/md5-cache/dev-python/python-troveclient-1.3.0 b/metadata/md5-cache/dev-python/python-troveclient-1.3.0
index a82c281bf136..9b679ad4c2a9 100644
--- a/metadata/md5-cache/dev-python/python-troveclient-1.3.0
+++ b/metadata/md5-cache/dev-python/python-troveclient-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-troveclient/python-troveclient-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9dcfe9c53bd3683c1c5b6e33fb23129
+_md5_=1dfe29f68b73b81b18625f05c94f8770
diff --git a/metadata/md5-cache/dev-python/python-troveclient-2.17.0 b/metadata/md5-cache/dev-python/python-troveclient-2.17.0
index cd38a98f9972..e296e874db60 100644
--- a/metadata/md5-cache/dev-python/python-troveclient-2.17.0
+++ b/metadata/md5-cache/dev-python/python-troveclient-2.17.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/prettytable-0.7.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/simplejson-3.5.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-mistralclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/python-mistralclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osc-lib-1.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-troveclient/python-troveclient-2.17.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1e4c9991dc714736caec321d16498d62
+_md5_=22a1853b90e3d942a6d0829b1419794c
diff --git a/metadata/md5-cache/dev-python/python-troveclient-2.5.0 b/metadata/md5-cache/dev-python/python-troveclient-2.5.0
index 13aad3967d31..83422d8dbde9 100644
--- a/metadata/md5-cache/dev-python/python-troveclient-2.5.0
+++ b/metadata/md5-cache/dev-python/python-troveclient-2.5.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-troveclient/python-troveclient-2.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46f4720d213e19a2d152d06ea5be0c8f
+_md5_=96a1b14752de4ff47714d6bc0388928a
diff --git a/metadata/md5-cache/dev-python/python-twitter-3.4.2 b/metadata/md5-cache/dev-python/python-twitter-3.4.2
index 7575f6ab595d..ae29bd1f4638 100644
--- a/metadata/md5-cache/dev-python/python-twitter-3.4.2
+++ b/metadata/md5-cache/dev-python/python-twitter-3.4.2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=!dev-python/twitter dev-python/oauth2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-oauthlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bear/python-twitter/archive/v3.4.2.tar.gz -> python-twitter-3.4.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=77fc49ecafc8d9a402fa2e322462688c
+_md5_=28423c4b955b452db0e1316c69832f68
diff --git a/metadata/md5-cache/dev-python/python-urljr-1.0.1-r1 b/metadata/md5-cache/dev-python/python-urljr-1.0.1-r1
index 869ef72bb6fa..9d6973892642 100644
--- a/metadata/md5-cache/dev-python/python-urljr-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/python-urljr-1.0.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=curl? ( >=dev-python/pycurl-7.15.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_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(-)]
 REQUIRED_USE=test? ( curl ) || ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.openidenabled.com/resources/downloads/python-openid/python-urljr-1.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fef8b38ba848023c56db17ee42c75f5d
+_md5_=0598e423445cf22ae488c9d8e852c1eb
diff --git a/metadata/md5-cache/dev-python/pytidylib-0.2.4 b/metadata/md5-cache/dev-python/pytidylib-0.2.4
index 30962fa4361a..7f23aeda4124 100644
--- a/metadata/md5-cache/dev-python/pytidylib-0.2.4
+++ b/metadata/md5-cache/dev-python/pytidylib-0.2.4
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=app-text/htmltidy python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytidylib/pytidylib-0.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae48ac8a61926a23e9c578713dd1784f
+_md5_=54815d03e7908995ef0d4915438b49df
diff --git a/metadata/md5-cache/dev-python/pytidylib-0.3.2 b/metadata/md5-cache/dev-python/pytidylib-0.3.2
index 3b8eda5dc81a..71fbe8d1c0d3 100644
--- a/metadata/md5-cache/dev-python/pytidylib-0.3.2
+++ b/metadata/md5-cache/dev-python/pytidylib-0.3.2
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=MIT
 RDEPEND=app-text/htmltidy dev-python/setuptools python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytidylib/pytidylib-0.3.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4d7a634833f4e275b4c893abca6f0fbc
+_md5_=a4fa9271131397e682ce034bb5f9bee0
diff --git a/metadata/md5-cache/dev-python/pytoml-0.1.14 b/metadata/md5-cache/dev-python/pytoml-0.1.14
index 2dddc2dcc069..e4b8a09e4a41 100644
--- a/metadata/md5-cache/dev-python/pytoml-0.1.14
+++ b/metadata/md5-cache/dev-python/pytoml-0.1.14
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/avakar/pytoml/archive/v0.1.14.tar.gz -> pytoml-0.1.14.tar.gz test? ( https://github.com/avakar/toml-test/archive/fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz -> toml-test-fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9443a1261cd10bb75616794237e12822
+_md5_=71485a1f436ee1534879c648ed73226d
diff --git a/metadata/md5-cache/dev-python/pytoml-0.1.18 b/metadata/md5-cache/dev-python/pytoml-0.1.18
index 990248d1f3f5..b29dcd930255 100644
--- a/metadata/md5-cache/dev-python/pytoml-0.1.18
+++ b/metadata/md5-cache/dev-python/pytoml-0.1.18
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/avakar/pytoml/archive/v0.1.18.tar.gz -> pytoml-0.1.18.tar.gz test? ( https://github.com/avakar/toml-test/archive/fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz -> toml-test-fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9443a1261cd10bb75616794237e12822
+_md5_=71485a1f436ee1534879c648ed73226d
diff --git a/metadata/md5-cache/dev-python/pytoml-0.1.20 b/metadata/md5-cache/dev-python/pytoml-0.1.20
index 8d7508ac724d..ea6f0d7e5346 100644
--- a/metadata/md5-cache/dev-python/pytoml-0.1.20
+++ b/metadata/md5-cache/dev-python/pytoml-0.1.20
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/avakar/pytoml/archive/v0.1.20.tar.gz -> pytoml-0.1.20.tar.gz test? ( https://github.com/avakar/toml-test/archive/b212790a6b7367489f389411bda009e5ff765f20.tar.gz -> toml-test-b212790a6b7367489f389411bda009e5ff765f20.tar.gz )
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=354fbfa2d6ff61e834f059b7306e8b6a
+_md5_=0bb13ce7b8d94ccf2429110704eb88b0
diff --git a/metadata/md5-cache/dev-python/pytools-2016.2.6-r1 b/metadata/md5-cache/dev-python/pytools-2016.2.6-r1
index b0cb9e9d82bf..ce605bb1dde5 100644
--- a/metadata/md5-cache/dev-python/pytools-2016.2.6-r1
+++ b/metadata/md5-cache/dev-python/pytools-2016.2.6-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/decorator-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/six-1.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2016.2.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce4d0ec0d88ed3c81fdf6662d97b3942
+_md5_=bf34c806a693d9657f460c313d8a62a4
diff --git a/metadata/md5-cache/dev-python/pytools-2017.4-r1 b/metadata/md5-cache/dev-python/pytools-2017.4-r1
index 2bb786a18dce..f78f70415fbf 100644
--- a/metadata/md5-cache/dev-python/pytools-2017.4-r1
+++ b/metadata/md5-cache/dev-python/pytools-2017.4-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/decorator-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2017.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d40595dd9cc1f4e8538c7d30ded06a5
+_md5_=661bfea767edf79d95116f6f3d769c74
diff --git a/metadata/md5-cache/dev-python/pytools-9999 b/metadata/md5-cache/dev-python/pytools-9999
index 69a737e7f364..9e58dea8d289 100644
--- a/metadata/md5-cache/dev-python/pytools-9999
+++ b/metadata/md5-cache/dev-python/pytools-9999
@@ -8,6 +8,7 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/decorator-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9c9e5e1edc71e4f8fe4a7dc22ec4f9c
+_md5_=d414c8e3e83f94a5ce27c32260aaecd6
diff --git a/metadata/md5-cache/dev-python/pyu2f-0.1.4 b/metadata/md5-cache/dev-python/pyu2f-0.1.4
index 82048703e3d9..996e1239b24e 100644
--- a/metadata/md5-cache/dev-python/pyu2f-0.1.4
+++ b/metadata/md5-cache/dev-python/pyu2f-0.1.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/pyu2f/archive/0.1.4.tar.gz -> pyu2f-0.1.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ff2bdacb38a16684738edda85fb89e5
+_md5_=e9024c9cda8679bc63e52c066dd3fb7e
diff --git a/metadata/md5-cache/dev-python/pyudev-0.20.0-r1 b/metadata/md5-cache/dev-python/pyudev-0.20.0-r1
index 4cb5a6ae4c98..093dabc23932 100644
--- a/metadata/md5-cache/dev-python/pyudev-0.20.0-r1
+++ b/metadata/md5-cache/dev-python/pyudev-0.20.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] virtual/udev pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=pygobject? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyudev/pyudev-0.20.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1c2f31c9e0ec711217ec28c18858b17
+_md5_=0fd1ca5026f03badee4f37b710c6a37e
diff --git a/metadata/md5-cache/dev-python/pyudev-0.21.0 b/metadata/md5-cache/dev-python/pyudev-0.21.0
index 58ced3cbf224..c3f2d6eea2be 100644
--- a/metadata/md5-cache/dev-python/pyudev-0.21.0
+++ b/metadata/md5-cache/dev-python/pyudev-0.21.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~arm64 ~mips x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/udev pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=pygobject? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyudev/pyudev-0.21.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e5cf5a4912b8985dee8c9943527b7c8
+_md5_=246ac982d3240cfa2fe4339faa9f39ee
diff --git a/metadata/md5-cache/dev-python/pywavelets-0.5.2 b/metadata/md5-cache/dev-python/pywavelets-0.5.2
index 82a791d459f0..31c300800ca6 100644
--- a/metadata/md5-cache/dev-python/pywavelets-0.5.2
+++ b/metadata/md5-cache/dev-python/pywavelets-0.5.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyWavelets/PyWavelets-0.5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a4c4d396a61ec06ca3e729b6de3c880
+_md5_=87fad4f7134bd1ac29ba4fbf968548f4
diff --git a/metadata/md5-cache/dev-python/pywavelets-0.5.2-r1 b/metadata/md5-cache/dev-python/pywavelets-0.5.2-r1
index 8309ff42f3ee..6d3c83a7971e 100644
--- a/metadata/md5-cache/dev-python/pywavelets-0.5.2-r1
+++ b/metadata/md5-cache/dev-python/pywavelets-0.5.2-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyWavelets/PyWavelets-0.5.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1b090f5ff8aad510290046cccdb63f14
+_md5_=8c410ee4864dc36a4e72519733ceba48
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.25-r1 b/metadata/md5-cache/dev-python/pyxdg-0.25-r1
index 81dedc0ad4bc..cb6b2c562160 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.25-r1
+++ b/metadata/md5-cache/dev-python/pyxdg-0.25-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~takluyver/pyxdg-0.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d43e4a88f2642c36ff96e4ca7881e97
+_md5_=6b17e7c9f50bce81dbfda4dc24f3b010
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.26 b/metadata/md5-cache/dev-python/pyxdg-0.26
index c6c3b41c5c7d..5f107c6fcfc6 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.26
+++ b/metadata/md5-cache/dev-python/pyxdg-0.26
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/takluyver/pyxdg/archive/rel-0.26.tar.gz -> pyxdg-rel-0.26.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2985f0b09df2e3dd4ba2696e9a5d06ef
+_md5_=06b896e7b9319bef3ae4f55ea08d4b29
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.26-r1 b/metadata/md5-cache/dev-python/pyxdg-0.26-r1
index 44da3071c7bb..938701aec062 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.26-r1
+++ b/metadata/md5-cache/dev-python/pyxdg-0.26-r1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/takluyver/pyxdg/archive/rel-0.26.tar.gz -> pyxdg-rel-0.26.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=952048d0d5f93863d1b1ef61b7e638c5
+_md5_=35f76f70782dcc2786cd1ab41b4e7832
diff --git a/metadata/md5-cache/dev-python/pyzbar-0.1.5 b/metadata/md5-cache/dev-python/pyzbar-0.1.5
index 1ecbf9c69484..aa99dbbb5a7c 100644
--- a/metadata/md5-cache/dev-python/pyzbar-0.1.5
+++ b/metadata/md5-cache/dev-python/pyzbar-0.1.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-gfx/zbar virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/NaturalHistoryMuseum/pyzbar/archive/v0.1.5.tar.gz -> pyzbar-0.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac971aca268423ddf1cc99ee7fe0eef9
+_md5_=29cee9d1731de8fffb282181e4a01c90
diff --git a/metadata/md5-cache/dev-python/pyzbar-0.1.7 b/metadata/md5-cache/dev-python/pyzbar-0.1.7
index 7b706461a1b8..37c2ebf4b968 100644
--- a/metadata/md5-cache/dev-python/pyzbar-0.1.7
+++ b/metadata/md5-cache/dev-python/pyzbar-0.1.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-gfx/zbar virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/NaturalHistoryMuseum/pyzbar/archive/v0.1.7.tar.gz -> pyzbar-0.1.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac971aca268423ddf1cc99ee7fe0eef9
+_md5_=29cee9d1731de8fffb282181e4a01c90
diff --git a/metadata/md5-cache/dev-python/pyzmq-16.0.2 b/metadata/md5-cache/dev-python/pyzmq-16.0.2
index 056f4e4c9270..80ba3a79c935 100644
--- a/metadata/md5-cache/dev-python/pyzmq-16.0.2
+++ b/metadata/md5-cache/dev-python/pyzmq-16.0.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-maco
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-4.1.2:= dev-python/py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-16.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b307eb6288832e5fc20a0dd8661ce8e
+_md5_=9380ceba0b2b1f7ab2ad03eeb073d188
diff --git a/metadata/md5-cache/dev-python/pyzmq-17.1.0 b/metadata/md5-cache/dev-python/pyzmq-17.1.0
index db2050ca1d20..4e88e1c6a396 100644
--- a/metadata/md5-cache/dev-python/pyzmq-17.1.0
+++ b/metadata/md5-cache/dev-python/pyzmq-17.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts] dev-python/py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-17.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8d89f2fca1d5f8d5f0f2d9f80a9094d
+_md5_=a03497eabef87d05c66c3b0f73f1a023
diff --git a/metadata/md5-cache/dev-python/pyzor-1.0.0-r1 b/metadata/md5-cache/dev-python/pyzor-1.0.0-r1
index 54abdd1d0b35..6735828ba5fe 100644
--- a/metadata/md5-cache/dev-python/pyzor-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/pyzor-1.0.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=pyzord? ( gdbm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) python_targets_python3_5? ( dev-lang/python:3.5[gdbm] ) python_targets_python3_6? ( dev-lang/python:3.6[gdbm] ) ) mysql? ( python_targets_python2_7? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gevent? ( dev-python/gevent[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=pyzord? ( || ( gdbm mysql redis ) ) test? ( gdbm mysql redis ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SpamExperts/pyzor/archive/release-1-0-0.tar.gz -> pyzor-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b48327cbeae6991994383b77a77109f1
+_md5_=455810656abad25256808f41bfa2c683
diff --git a/metadata/md5-cache/dev-python/qserve-0.2.8-r1 b/metadata/md5-cache/dev-python/qserve-0.2.8-r1
index 76d6246f1e65..07d309fb2094 100644
--- a/metadata/md5-cache/dev-python/qserve-0.2.8-r1
+++ b/metadata/md5-cache/dev-python/qserve-0.2.8-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qserve/qserve-0.2.8.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42d3fa56e1a1189148ade9067fbf93cb
+_md5_=7aae8d60e114e8bd0518e71819fba3b0
diff --git a/metadata/md5-cache/dev-python/qtconsole-4.3.1 b/metadata/md5-cache/dev-python/qtconsole-4.3.1
index 0891dcef9921..1be1a8e2a413 100644
--- a/metadata/md5-cache/dev-python/qtconsole-4.3.1
+++ b/metadata/md5-cache/dev-python/qtconsole-4.3.1
@@ -9,7 +9,8 @@ LICENSE=BSD
 PDEPEND=dev-python/ipython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 RDEPEND=dev-python/ipykernel[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-4.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d22175cdf7516d4320fd0d82d04c252
+_md5_=0e888f58c385062f7ba4aa183bd4cb4d
diff --git a/metadata/md5-cache/dev-python/radon-1.4.2 b/metadata/md5-cache/dev-python/radon-1.4.2
index 37939e221459..a1ad0ddf07e7 100644
--- a/metadata/md5-cache/dev-python/radon-1.4.2
+++ b/metadata/md5-cache/dev-python/radon-1.4.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/colorama-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/colorama-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8-polyfill[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mando-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mando-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/radon/radon-1.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5478c78cc516bc97cf3d00ff92c81a24
+_md5_=adcf5f8de6884b27f3e69f18f256cc69
diff --git a/metadata/md5-cache/dev-python/raet-0.6.8 b/metadata/md5-cache/dev-python/raet-0.6.8
index b3de55e57b9e..a1c6dceab235 100644
--- a/metadata/md5-cache/dev-python/raet-0.6.8
+++ b/metadata/md5-cache/dev-python/raet-0.6.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/libnacl-1.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ioflo-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/raet/raet-0.6.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=287ecc66a897fd7a8955d367cc5e22ad
+_md5_=c164288f129bf8069b347ea66390c47e
diff --git a/metadata/md5-cache/dev-python/ramlfications-0.1.9_p20160718 b/metadata/md5-cache/dev-python/ramlfications-0.1.9_p20160718
index 52e08cde7cbe..5030ca8e801a 100644
--- a/metadata/md5-cache/dev-python/ramlfications-0.1.9_p20160718
+++ b/metadata/md5-cache/dev-python/ramlfications-0.1.9_p20160718
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markdown2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonref[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xmltodict[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spotify/ramlfications/archive/32a11cd7d75c4c5b3e3fc01c383314be298b0f9b.tar.gz -> ramlfications-0.1.9_p20160718.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f20ad6d2d4bb1b23fcad39991b072492
+_md5_=3790b4ea4e678500d3502b1fd90b12ca
diff --git a/metadata/md5-cache/dev-python/ratelimit-1.4.1 b/metadata/md5-cache/dev-python/ratelimit-1.4.1
index 8d6886f53f0b..7bdd4703c839 100644
--- a/metadata/md5-cache/dev-python/ratelimit-1.4.1
+++ b/metadata/md5-cache/dev-python/ratelimit-1.4.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomasbasham/ratelimit/archive/v1.4.1.tar.gz -> ratelimit-1.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a2d9efc6e3577e72c23e6201262989f
+_md5_=af1bf540fee983f38aee087f8aca0b07
diff --git a/metadata/md5-cache/dev-python/raven-5.33.0 b/metadata/md5-cache/dev-python/raven-5.33.0
index d327703bc448..b223b9ff6fc7 100644
--- a/metadata/md5-cache/dev-python/raven-5.33.0
+++ b/metadata/md5-cache/dev-python/raven-5.33.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/contextlib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/raven/raven-5.33.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3137937d90a1bfb4e8b155be7e49804d
+_md5_=f2bb68b0fcc1b66efd7d8519a48c873f
diff --git a/metadata/md5-cache/dev-python/rdflib-4.2.1 b/metadata/md5-cache/dev-python/rdflib-4.2.1
index 166820f52dc3..ea3944589152 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.2.1
+++ b/metadata/md5-cache/dev-python/rdflib-4.2.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] berkdb? ( dev-python/bsddb3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redland? ( dev-libs/redland-bindings[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-4.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fe6f96efc3fe626ae117d5405118188
+_md5_=8fa5f464fa9b06959c989fc01264febc
diff --git a/metadata/md5-cache/dev-python/rdflib-4.2.2 b/metadata/md5-cache/dev-python/rdflib-4.2.2
index 3c19926d2330..1114f67ff77e 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.2.2
+++ b/metadata/md5-cache/dev-python/rdflib-4.2.2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] berkdb? ( dev-python/bsddb3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redland? ( dev-libs/redland-bindings[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-4.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8de2484d56f1a0dccfb416085a469699
+_md5_=86eee32caf02ca7dddeaa1214db70749
diff --git a/metadata/md5-cache/dev-python/readme_renderer-17.2 b/metadata/md5-cache/dev-python/readme_renderer-17.2
index 812aab1424ba..3034120f26d7 100644
--- a/metadata/md5-cache/dev-python/readme_renderer-17.2
+++ b/metadata/md5-cache/dev-python/readme_renderer-17.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/bleach-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.13.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/readme_renderer/readme_renderer-17.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=768ed9a3c33aa5cb6be8818c820e17aa
+_md5_=bbf45e85550b5bc1766603d01295ebd3
diff --git a/metadata/md5-cache/dev-python/rebulk-0.9.0 b/metadata/md5-cache/dev-python/rebulk-0.9.0
index 6e6bda6fe18a..cd6e9d4e1493 100644
--- a/metadata/md5-cache/dev-python/rebulk-0.9.0
+++ b/metadata/md5-cache/dev-python/rebulk-0.9.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rebulk/rebulk-0.9.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8791d86e01c4217857f061b01885d45
+_md5_=b43a587d01eb3f7967c14e35785897ea
diff --git a/metadata/md5-cache/dev-python/rebulk-9999 b/metadata/md5-cache/dev-python/rebulk-9999
index c087acfca524..fb837aa45b85 100644
--- a/metadata/md5-cache/dev-python/rebulk-9999
+++ b/metadata/md5-cache/dev-python/rebulk-9999
@@ -8,6 +8,7 @@ LICENSE=MIT Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=467b3288c1d2f3eb7fead4ede8881d5e
+_md5_=5e8122bd334e330dd9a328d62b5d092e
diff --git a/metadata/md5-cache/dev-python/redis-py-2.10.5 b/metadata/md5-cache/dev-python/redis-py-2.10.5
index ab9b73e8389b..40af9c59cae1 100644
--- a/metadata/md5-cache/dev-python/redis-py-2.10.5
+++ b/metadata/md5-cache/dev-python/redis-py-2.10.5
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-2.10.5.tar.gz -> redis-py-2.10.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e20064bb802c4ab311b3cf7ac08c0aa
+_md5_=6b01c4bd66ee48ea068191bc2549df55
diff --git a/metadata/md5-cache/dev-python/redis-py-2.10.6 b/metadata/md5-cache/dev-python/redis-py-2.10.6
index e2e79f3b5093..3cd5472b7e0c 100644
--- a/metadata/md5-cache/dev-python/redis-py-2.10.6
+++ b/metadata/md5-cache/dev-python/redis-py-2.10.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-2.10.6.tar.gz -> redis-py-2.10.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=963fa33c8bff61368aa9a17483a61595
+_md5_=3e1ea95a7e324145ece4e48c97f2d2bc
diff --git a/metadata/md5-cache/dev-python/redis-py-2.9.1 b/metadata/md5-cache/dev-python/redis-py-2.9.1
index a13701f7a790..04e5ea5c095e 100644
--- a/metadata/md5-cache/dev-python/redis-py-2.9.1
+++ b/metadata/md5-cache/dev-python/redis-py-2.9.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-2.9.1.tar.gz -> redis-py-2.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=442b8be68c619b45499c6a2acdb6b0fc
+_md5_=e610a31ec06e0ddc6e0e75ab232afc9e
diff --git a/metadata/md5-cache/dev-python/redis-py-3.2.1 b/metadata/md5-cache/dev-python/redis-py-3.2.1
index 34302b450312..61ad3e954dcc 100644
--- a/metadata/md5-cache/dev-python/redis-py-3.2.1
+++ b/metadata/md5-cache/dev-python/redis-py-3.2.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-3.2.1.tar.gz -> redis-py-3.2.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0d8c60a7c16381f4488b63026c644da8
+_md5_=5313971942884b1be8475d36922444e2
diff --git a/metadata/md5-cache/dev-python/regendoc-0.6.1 b/metadata/md5-cache/dev-python/regendoc-0.6.1
index 0492d031cf5f..aa6404c2e8d0 100644
--- a/metadata/md5-cache/dev-python/regendoc-0.6.1
+++ b/metadata/md5-cache/dev-python/regendoc-0.6.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/RegenDoc/regendoc-0.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5454725c07742bdec23f519ec9cb1998
+_md5_=ad432a573f3f4038414ebb5a5d556827
diff --git a/metadata/md5-cache/dev-python/regions-0.2 b/metadata/md5-cache/dev-python/regions-0.2
index 0c2886646d3d..e8ae9e934b17 100644
--- a/metadata/md5-cache/dev-python/regions-0.2
+++ b/metadata/md5-cache/dev-python/regions-0.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/regions/regions-0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60ddbd2bc96a2e47c755a5a91ab2308e
+_md5_=80a0517b58bbf9b848a2971fbf7cd70a
diff --git a/metadata/md5-cache/dev-python/reproject-0.3.1 b/metadata/md5-cache/dev-python/reproject-0.3.1
index 122f5fd92d6e..04cdc66c3427 100644
--- a/metadata/md5-cache/dev-python/reproject-0.3.1
+++ b/metadata/md5-cache/dev-python/reproject-0.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/reproject/reproject-0.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=432a79a747155d244e1f441ab09e83f5
+_md5_=9bdc1046bfe945e7da69cf3195ba8336
diff --git a/metadata/md5-cache/dev-python/requests-kerberos-0.12.0 b/metadata/md5-cache/dev-python/requests-kerberos-0.12.0
index 28535d605dea..5207a12388cc 100644
--- a/metadata/md5-cache/dev-python/requests-kerberos-0.12.0
+++ b/metadata/md5-cache/dev-python/requests-kerberos-0.12.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=>=dev-python/requests-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=dev-python/pykerberos-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pykerberos-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/requests/requests-kerberos/archive/v0.12.0.tar.gz -> requests-kerberos-0.12.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c4cf5eae68e7e2495416e747cd5c68f0
+_md5_=3ed54db1c67f7bce4ec6dfd8197d9e34
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.2.0 b/metadata/md5-cache/dev-python/requests-mock-1.2.0
index 226cda9fb267..a43e6f667264 100644
--- a/metadata/md5-cache/dev-python/requests-mock-1.2.0
+++ b/metadata/md5-cache/dev-python/requests-mock-1.2.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-mock/requests-mock-1.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e17fd5eb4819ebaf0eb0693a574c0699
+_md5_=e8b46aa74e8d418e54374ff6557b2f9f
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.5.0 b/metadata/md5-cache/dev-python/requests-mock-1.5.0
index 1c5f6dfd86ad..0e8143b938d6 100644
--- a/metadata/md5-cache/dev-python/requests-mock-1.5.0
+++ b/metadata/md5-cache/dev-python/requests-mock-1.5.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-mock/requests-mock-1.5.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5bc3daef068d6df84b924111099fbbef
+_md5_=84b2254099fb0c62ecaaa4ff782209f8
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.5.2 b/metadata/md5-cache/dev-python/requests-mock-1.5.2
index 46af61bde73f..6476443d18a0 100644
--- a/metadata/md5-cache/dev-python/requests-mock-1.5.2
+++ b/metadata/md5-cache/dev-python/requests-mock-1.5.2
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-mock/requests-mock-1.5.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7663831f0cf80f046f59fd3d377567bf
+_md5_=25b243164f60986d34fc7d4a420685b2
diff --git a/metadata/md5-cache/dev-python/requests-oauthlib-0.7.0 b/metadata/md5-cache/dev-python/requests-oauthlib-0.7.0
index 193daee3ab9f..e150d450e139 100644
--- a/metadata/md5-cache/dev-python/requests-oauthlib-0.7.0
+++ b/metadata/md5-cache/dev-python/requests-oauthlib-0.7.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=>=dev-python/requests-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/requests/requests-oauthlib/archive/v0.7.0.tar.gz -> requests-oauthlib-0.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c5497cb6ad7e0ff21760520db696d15b
+_md5_=df3c0120bd21b7833f784b593d2f97f7
diff --git a/metadata/md5-cache/dev-python/responses-0.6.0 b/metadata/md5-cache/dev-python/responses-0.6.0
index 3c9105f9d524..521be39184a2 100644
--- a/metadata/md5-cache/dev-python/responses-0.6.0
+++ b/metadata/md5-cache/dev-python/responses-0.6.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cookies[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getsentry/responses/archive/0.6.0.tar.gz -> responses-0.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a63ca9c266ed871e60781b9372df437
+_md5_=086f832d6bb86e91a022889881439738
diff --git a/metadata/md5-cache/dev-python/responses-0.9.0 b/metadata/md5-cache/dev-python/responses-0.9.0
index 8683cb5a505c..0b016958dac6 100644
--- a/metadata/md5-cache/dev-python/responses-0.9.0
+++ b/metadata/md5-cache/dev-python/responses-0.9.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cookies[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/responses/responses-0.9.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fb9c4efbda0d3e1965608f7e66d5be79
+_md5_=6a1dc58a99abe2d54c75aba56dc297e3
diff --git a/metadata/md5-cache/dev-python/restkit-4.2.2 b/metadata/md5-cache/dev-python/restkit-4.2.2
index 51748b3e6835..146b557d2f78 100644
--- a/metadata/md5-cache/dev-python/restkit-4.2.2
+++ b/metadata/md5-cache/dev-python/restkit-4.2.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 ppc64 s390 ~sh x86
 LICENSE=MIT
 RDEPEND=cli? ( dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/webob[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/socketpool-0.5.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/http-parser-0.8.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/restkit/restkit-4.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ad283dfd07c24f7c779439cfe2f859a
+_md5_=18b8330a2c6818a76b0bbfec0fb60d4e
diff --git a/metadata/md5-cache/dev-python/rfc3986-0.3.1 b/metadata/md5-cache/dev-python/rfc3986-0.3.1
index b2a9671f0fb0..6c170fb5acef 100644
--- a/metadata/md5-cache/dev-python/rfc3986-0.3.1
+++ b/metadata/md5-cache/dev-python/rfc3986-0.3.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 sh sparc x8
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-0.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2aecc999547a15c2f32e97da5024cda3
+_md5_=e55e1650a71aafb80e89d07c9c381b43
diff --git a/metadata/md5-cache/dev-python/rfc3986-0.4.1 b/metadata/md5-cache/dev-python/rfc3986-0.4.1
index fc4b3091a9fb..11a2e56e7966 100644
--- a/metadata/md5-cache/dev-python/rfc3986-0.4.1
+++ b/metadata/md5-cache/dev-python/rfc3986-0.4.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sp
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-0.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7048369ff60454450b3e9d1c803a8e88
+_md5_=a95a067ef6818bb084692b49f4a381ab
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.1.0 b/metadata/md5-cache/dev-python/rfc3986-1.1.0
index c198fc861c57..9e062202ead4 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.1.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.1.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4566727a4dd52a460501fbae6a30a85b
+_md5_=5298bb64520fbde4f4f2a3a50fe124e3
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.2.0 b/metadata/md5-cache/dev-python/rfc3986-1.2.0
index 9e6f3f61db24..0afb52ca9e3b 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.2.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.2.0
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.2.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=10f7215aa0504b6d14e2425bcb20be46
+_md5_=c3c2a916ff27b213567c9d64b7dc6299
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.3.2 b/metadata/md5-cache/dev-python/rfc3986-1.3.2
index 61ef8f7a4656..ea67eb6f09bb 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.3.2
+++ b/metadata/md5-cache/dev-python/rfc3986-1.3.2
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.3.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cfa485095b7574641ddca0be327d2b4a
+_md5_=e2c96f9f1bd0206ca09e37f95c4aebcf
diff --git a/metadata/md5-cache/dev-python/rnc2rng-2.4 b/metadata/md5-cache/dev-python/rnc2rng-2.4
index 3a652f2a0407..42f8dcd9f956 100644
--- a/metadata/md5-cache/dev-python/rnc2rng-2.4
+++ b/metadata/md5-cache/dev-python/rnc2rng-2.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=dev-python/rply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9edf98d6fddf520888210f5231f2508f
+_md5_=0bd50102b596db9a106510dd28473ea2
diff --git a/metadata/md5-cache/dev-python/rnc2rng-2.4.1 b/metadata/md5-cache/dev-python/rnc2rng-2.4.1
index 4ca7d98fdf7a..efcbb77f3376 100644
--- a/metadata/md5-cache/dev-python/rnc2rng-2.4.1
+++ b/metadata/md5-cache/dev-python/rnc2rng-2.4.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=dev-python/rply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9edf98d6fddf520888210f5231f2508f
+_md5_=0bd50102b596db9a106510dd28473ea2
diff --git a/metadata/md5-cache/dev-python/rnc2rng-2.5 b/metadata/md5-cache/dev-python/rnc2rng-2.5
index c2cea587a868..cbccc73a1257 100644
--- a/metadata/md5-cache/dev-python/rnc2rng-2.5
+++ b/metadata/md5-cache/dev-python/rnc2rng-2.5
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=dev-python/rply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.5.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=03897d31cc9ce8673cf59e88fb3064b3
+_md5_=ccd9b2a72d47f99009de914c80c05ad9
diff --git a/metadata/md5-cache/dev-python/roman-2.0.0 b/metadata/md5-cache/dev-python/roman-2.0.0
index 639822db9109..3e442259ffde 100644
--- a/metadata/md5-cache/dev-python/roman-2.0.0
+++ b/metadata/md5-cache/dev-python/roman-2.0.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=PSF-2
 RDEPEND=!<dev-python/docutils-0.9[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/roman/roman-2.0.0.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2cc510da84ce9b765b48b45d38287f0b
+_md5_=fe87da2f34bd6656ebedba090a960c31
diff --git a/metadata/md5-cache/dev-python/roman-3.0 b/metadata/md5-cache/dev-python/roman-3.0
index 5e83184822e0..0303889f0c73 100644
--- a/metadata/md5-cache/dev-python/roman-3.0
+++ b/metadata/md5-cache/dev-python/roman-3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=PSF-2
 RDEPEND=!<dev-python/docutils-0.9[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/roman/roman-3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=900145bd9802e3db8f0baf3cdaa93d63
+_md5_=9a1cf9bd9be6eb25f2cf82a667ca79a2
diff --git a/metadata/md5-cache/dev-python/root_numpy-4.4.0 b/metadata/md5-cache/dev-python/root_numpy-4.4.0
index e3ad2576b98c..c4de03a2510e 100644
--- a/metadata/md5-cache/dev-python/root_numpy-4.4.0
+++ b/metadata/md5-cache/dev-python/root_numpy-4.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-physics/root[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/root_numpy/root_numpy-4.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84e214645e9e762b1b94fa438cfd5527
+_md5_=e7cf9aad014ad8d8d32b2e85a43121e1
diff --git a/metadata/md5-cache/dev-python/root_numpy-4.7.3 b/metadata/md5-cache/dev-python/root_numpy-4.7.3
index 8525be631653..0766c70e7d91 100644
--- a/metadata/md5-cache/dev-python/root_numpy-4.7.3
+++ b/metadata/md5-cache/dev-python/root_numpy-4.7.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] sci-physics/root:=[python,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/root_numpy/root_numpy-4.7.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b6d76b382fa865959e68726083ee73af
+_md5_=5854d999df079e7d9241926e9eb6f05a
diff --git a/metadata/md5-cache/dev-python/rosdistro-0.7.2 b/metadata/md5-cache/dev-python/rosdistro-0.7.2
index 24369e980ec0..c447d9bead37 100644
--- a/metadata/md5-cache/dev-python/rosdistro-0.7.2
+++ b/metadata/md5-cache/dev-python/rosdistro-0.7.2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosdistro/archive/0.7.2.tar.gz -> rosdistro-0.7.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=48ec2c0232cfe0aaf3b2d36f8012ba06
+_md5_=b1838043be32b3a2e10a966645e767d2
diff --git a/metadata/md5-cache/dev-python/rosdistro-0.7.4 b/metadata/md5-cache/dev-python/rosdistro-0.7.4
index 93228a919b29..5b6079febed3 100644
--- a/metadata/md5-cache/dev-python/rosdistro-0.7.4
+++ b/metadata/md5-cache/dev-python/rosdistro-0.7.4
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosdistro/archive/0.7.4.tar.gz -> rosdistro-0.7.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=48ec2c0232cfe0aaf3b2d36f8012ba06
+_md5_=b1838043be32b3a2e10a966645e767d2
diff --git a/metadata/md5-cache/dev-python/rosdistro-9999 b/metadata/md5-cache/dev-python/rosdistro-9999
index db983c0c1a99..0eda7139fd8f 100644
--- a/metadata/md5-cache/dev-python/rosdistro-9999
+++ b/metadata/md5-cache/dev-python/rosdistro-9999
@@ -9,6 +9,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=48ec2c0232cfe0aaf3b2d36f8012ba06
+_md5_=b1838043be32b3a2e10a966645e767d2
diff --git a/metadata/md5-cache/dev-python/rospkg-1.1.10 b/metadata/md5-cache/dev-python/rospkg-1.1.10
index 611066304ae6..2444870c53f0 100644
--- a/metadata/md5-cache/dev-python/rospkg-1.1.10
+++ b/metadata/md5-cache/dev-python/rospkg-1.1.10
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.1.10.tar.gz -> rospkg-1.1.10.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6bfb39267d9ead1b01c3b550b6f9b37f
+_md5_=52b34ded1e649e3813f3dd10d07c270e
diff --git a/metadata/md5-cache/dev-python/rospkg-1.1.9 b/metadata/md5-cache/dev-python/rospkg-1.1.9
index de307b9a5227..cbe6fe4f18b9 100644
--- a/metadata/md5-cache/dev-python/rospkg-1.1.9
+++ b/metadata/md5-cache/dev-python/rospkg-1.1.9
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.1.9.tar.gz -> rospkg-1.1.9.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6bfb39267d9ead1b01c3b550b6f9b37f
+_md5_=52b34ded1e649e3813f3dd10d07c270e
diff --git a/metadata/md5-cache/dev-python/rospkg-9999 b/metadata/md5-cache/dev-python/rospkg-9999
index aeb698706228..a830fa2c805c 100644
--- a/metadata/md5-cache/dev-python/rospkg-9999
+++ b/metadata/md5-cache/dev-python/rospkg-9999
@@ -9,6 +9,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6bfb39267d9ead1b01c3b550b6f9b37f
+_md5_=52b34ded1e649e3813f3dd10d07c270e
diff --git a/metadata/md5-cache/dev-python/rply-0.7.4 b/metadata/md5-cache/dev-python/rply-0.7.4
index 845a62fabee5..c94f133080a4 100644
--- a/metadata/md5-cache/dev-python/rply-0.7.4
+++ b/metadata/md5-cache/dev-python/rply-0.7.4
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alex/rply/archive/v0.7.4.tar.gz -> rply-0.7.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a9448e1782671919ce8e5e92cdc16dbb
+_md5_=663dc2a9244570d2488ec1815eab5bd6
diff --git a/metadata/md5-cache/dev-python/rply-0.7.5 b/metadata/md5-cache/dev-python/rply-0.7.5
index 5b5faf4dd855..79e44180140b 100644
--- a/metadata/md5-cache/dev-python/rply-0.7.5
+++ b/metadata/md5-cache/dev-python/rply-0.7.5
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alex/rply/archive/v0.7.5.tar.gz -> rply-0.7.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b912f9c40d34d8d6ca471d6b2164794
+_md5_=5015ad54872962e058304ead73969ab9
diff --git a/metadata/md5-cache/dev-python/rpy-2.6.2 b/metadata/md5-cache/dev-python/rpy-2.6.2
index 26949e54bc31..3f454aab31d2 100644
--- a/metadata/md5-cache/dev-python/rpy-2.6.2
+++ b/metadata/md5-cache/dev-python/rpy-2.6.2
@@ -9,7 +9,8 @@ LICENSE=AGPL-3 GPL-2 LGPL-2.1 MPL-1.1
 PDEPEND=dev-python/ipython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 RDEPEND=>=dev-lang/R-3.1 dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pandas-0.13.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-singledispatch[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rpy2/rpy2-2.6.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2bd85959e36f8d7f73c7267aa4988af8
+_md5_=e0e67d226440aed6e143181b376ea787
diff --git a/metadata/md5-cache/dev-python/rsa-3.2.3-r1 b/metadata/md5-cache/dev-python/rsa-3.2.3-r1
index 6285159f7589..a6e41859f9fa 100644
--- a/metadata/md5-cache/dev-python/rsa-3.2.3-r1
+++ b/metadata/md5-cache/dev-python/rsa-3.2.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rsa/rsa-3.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb795faa5e183a3bbe455065a51e1972
+_md5_=6e978ab9bc7c6162dea10b9e185fa57d
diff --git a/metadata/md5-cache/dev-python/rsa-3.4.2 b/metadata/md5-cache/dev-python/rsa-3.4.2
index 6ae365067b37..f1a783b60332 100644
--- a/metadata/md5-cache/dev-python/rsa-3.4.2
+++ b/metadata/md5-cache/dev-python/rsa-3.4.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rsa/rsa-3.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3c0996941d57b940f35a8f5597b1bdb
+_md5_=bab41fbfcfc69133a10bdc34e44fa823
diff --git a/metadata/md5-cache/dev-python/rst-linker-1.11 b/metadata/md5-cache/dev-python/rst-linker-1.11
index f1c9bafbee73..0d471c16abe8 100644
--- a/metadata/md5-cache/dev-python/rst-linker-1.11
+++ b/metadata/md5-cache/dev-python/rst-linker-1.11
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~
 LICENSE=MIT
 RDEPEND=dev-python/importlib_metadata[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rst.linker/rst.linker-1.11.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ed8466052e947bd72a2c5b7e688e882c
+_md5_=9e325ec6d8d0717fe92c5fb2e93d67ba
diff --git a/metadata/md5-cache/dev-python/rst-linker-1.9-r1 b/metadata/md5-cache/dev-python/rst-linker-1.9-r1
index a9827c16c823..d116917088cd 100644
--- a/metadata/md5-cache/dev-python/rst-linker-1.9-r1
+++ b/metadata/md5-cache/dev-python/rst-linker-1.9-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=MIT
 RDEPEND=dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rst.linker/rst.linker-1.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0eaf8659f22ade2f489039ca238019bd
+_md5_=2186f0cad3496e7b60b216387dca155a
diff --git a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3 b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3
index 56a66411e528..9b921e276bae 100644
--- a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3
+++ b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/std.pathlib/get/0.6.3.tar.gz -> ruamel-std-pathlib-0.6.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bf7caa0cd4327f7984dd2b2d17e07bc4
+_md5_=afbcf684578a813bdbe48cc1f54454d8
diff --git a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4 b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4
index b754df2e5c59..cf2c8a669cee 100644
--- a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4
+++ b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/std.pathlib/get/0.6.4.tar.gz -> ruamel-std-pathlib-0.6.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd2e3864133ea31c831227a6a102abbd
+_md5_=2ed3e4735bed318b0db07e0333446c37
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35 b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35
index d9bcd866b765..7c500623cb06 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/yaml/get/0.15.35.tar.gz -> ruamel-yaml-0.15.35.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d3bf46e27bf548718ce332dfafb0d5d
+_md5_=f1224c3fcb4f30b346ba198eb9e09b39
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.96 b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.96
index 8d0a5f79f928..3362708b7e60 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.96
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.96
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/yaml/get/0.15.96.tar.gz -> ruamel-yaml-0.15.96.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2facf293332a084b1336e982a5a45bc1
+_md5_=f7c4a6e98428978ce5ecf133e9706055
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.97 b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.97
index de27719a9d8e..d32ff6b07ab4 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.97
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.97
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/yaml/get/0.15.97.tar.gz -> ruamel-yaml-0.15.97.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=018e3ea8909983aea399c6e805dc85f1
+_md5_=29521c2ee58a0b326897578e98bfa208
diff --git a/metadata/md5-cache/dev-python/s3fs-0.1.2 b/metadata/md5-cache/dev-python/s3fs-0.1.2
index c5dfe1966015..77c04c133753 100644
--- a/metadata/md5-cache/dev-python/s3fs-0.1.2
+++ b/metadata/md5-cache/dev-python/s3fs-0.1.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3fs/s3fs-0.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b92f639b76fdb365a239aa369b82ade7
+_md5_=5f23e5cb4b8d5e45a55adea0516f0a00
diff --git a/metadata/md5-cache/dev-python/s3fs-0.1.5 b/metadata/md5-cache/dev-python/s3fs-0.1.5
index 55c556d42291..71d1709ff784 100644
--- a/metadata/md5-cache/dev-python/s3fs-0.1.5
+++ b/metadata/md5-cache/dev-python/s3fs-0.1.5
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3fs/s3fs-0.1.5.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e267d247cdb19f3ff4b4d75932f2720d
+_md5_=e7ee32584cde3b57ed50c4aed3c18c60
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.1.13-r1 b/metadata/md5-cache/dev-python/s3transfer-0.1.13-r1
index 1502a19a130f..6214b551dcc9 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.1.13-r1
+++ b/metadata/md5-cache/dev-python/s3transfer-0.1.13-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.1.13.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=26e16eb3efaefe24e1b4abc0a6a30803
+_md5_=0ef3a30aa1f937720178077416ab808b
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.2.0 b/metadata/md5-cache/dev-python/s3transfer-0.2.0
index aced14257922..8e70f5ad5a2c 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.2.0
+++ b/metadata/md5-cache/dev-python/s3transfer-0.2.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.2.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dfcc6d07b12ce533c8ad7c446577389d
+_md5_=9d82416500157e23d12d661bd2f1458f
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.2.1 b/metadata/md5-cache/dev-python/s3transfer-0.2.1
index 6d1851e4b554..4a2c545afff1 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.2.1
+++ b/metadata/md5-cache/dev-python/s3transfer-0.2.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/botocore[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.2.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=38d8211e8b9d39b1d7e18f507c9b13dc
+_md5_=a0c4224526a502b28d7a153b6eeca208
diff --git a/metadata/md5-cache/dev-python/sabyenc-3.3.5 b/metadata/md5-cache/dev-python/sabyenc-3.3.5
index b1b005a93a30..42929a01e577 100644
--- a/metadata/md5-cache/dev-python/sabyenc-3.3.5
+++ b/metadata/md5-cache/dev-python/sabyenc-3.3.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sabnzbd/sabyenc/tarball/v3.3.5 -> sabyenc-3.3.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e4b7e514d38b81bbd067ccf6770044a
+_md5_=d29229db9a929a5d75683f182652886e
diff --git a/metadata/md5-cache/dev-python/scandir-1.10.0 b/metadata/md5-cache/dev-python/scandir-1.10.0
index 45585a99481f..af8e94a9cadd 100644
--- a/metadata/md5-cache/dev-python/scandir-1.10.0
+++ b/metadata/md5-cache/dev-python/scandir-1.10.0
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-s
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.10.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ab3f2c663f52c604ae73f61bea5e29f6
+_md5_=cf32cdbec44dae13bdcc02978d1feab9
diff --git a/metadata/md5-cache/dev-python/scandir-1.10.0-r1 b/metadata/md5-cache/dev-python/scandir-1.10.0-r1
index 31c6bbd4a59b..6cf6063c574f 100644
--- a/metadata/md5-cache/dev-python/scandir-1.10.0-r1
+++ b/metadata/md5-cache/dev-python/scandir-1.10.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.10.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=99329873c16f29fc3aa7dd1791c7a063
+_md5_=a5063d1e3a6e1aa4061af9b74b7a97f0
diff --git a/metadata/md5-cache/dev-python/scapy-python3-0.18-r1 b/metadata/md5-cache/dev-python/scapy-python3-0.18-r1
index a31fcceda6ba..ce0b0ecf01f4 100644
--- a/metadata/md5-cache/dev-python/scapy-python3-0.18-r1
+++ b/metadata/md5-cache/dev-python/scapy-python3-0.18-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scapy-python3/scapy-python3-0.18.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b816abbc08d1f1234983375da66c171
+_md5_=fbeb0ab54a693990780348d44d5a80db
diff --git a/metadata/md5-cache/dev-python/scapy-python3-0.21 b/metadata/md5-cache/dev-python/scapy-python3-0.21
index bf22e218bdf9..b5c9abea8df1 100644
--- a/metadata/md5-cache/dev-python/scapy-python3-0.21
+++ b/metadata/md5-cache/dev-python/scapy-python3-0.21
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scapy-python3/scapy-python3-0.21.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b816abbc08d1f1234983375da66c171
+_md5_=fbeb0ab54a693990780348d44d5a80db
diff --git a/metadata/md5-cache/dev-python/scapy-python3-0.23 b/metadata/md5-cache/dev-python/scapy-python3-0.23
index 71683501b9b7..b5061c6ec483 100644
--- a/metadata/md5-cache/dev-python/scapy-python3-0.23
+++ b/metadata/md5-cache/dev-python/scapy-python3-0.23
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scapy-python3/scapy-python3-0.23.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbf8bd9b6a6c6e75e2f8c5f4c8f61932
+_md5_=10dc3264945d72b8a846bc1ffa3d7539
diff --git a/metadata/md5-cache/dev-python/schedule-0.4.2 b/metadata/md5-cache/dev-python/schedule-0.4.2
index 0bdbf9225a69..b1de2acd10b7 100644
--- a/metadata/md5-cache/dev-python/schedule-0.4.2
+++ b/metadata/md5-cache/dev-python/schedule-0.4.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/schedule/schedule-0.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbbde5b6939aff2a2dadb525cfe54232
+_md5_=a757d0b24a4848d9391f987b59f16759
diff --git a/metadata/md5-cache/dev-python/schedule-0.5.0 b/metadata/md5-cache/dev-python/schedule-0.5.0
index 0ff31eccc711..7a46f7a80885 100644
--- a/metadata/md5-cache/dev-python/schedule-0.5.0
+++ b/metadata/md5-cache/dev-python/schedule-0.5.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/schedule/schedule-0.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74a2e205ba6d8107599bded8dc535310
+_md5_=e9c4fb6982bb9274601b65081f478bb9
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.13 b/metadata/md5-cache/dev-python/scrypt-0.8.13
index c763d10e716b..b282aed1a598 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.13
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.13
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/openssl:0= python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ee9f616b5a51337ccaa6db7dd7d4bbb5
+_md5_=2060549e356a4415ce8d59fe5f6f3151
diff --git a/metadata/md5-cache/dev-python/seaborn-0.7.1 b/metadata/md5-cache/dev-python/seaborn-0.7.1
index e020fd8049d9..8ce22293f55d 100644
--- a/metadata/md5-cache/dev-python/seaborn-0.7.1
+++ b/metadata/md5-cache/dev-python/seaborn-0.7.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/patsy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/statsmodels[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/seaborn/seaborn-0.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ca65f5f30410dd7fbccb3f8cb00c44a
+_md5_=1e8f8b4c89de2bcd527f648463c99ecb
diff --git a/metadata/md5-cache/dev-python/seaborn-0.8.1 b/metadata/md5-cache/dev-python/seaborn-0.8.1
index 633dd483a73d..cc76c2471b4e 100644
--- a/metadata/md5-cache/dev-python/seaborn-0.8.1
+++ b/metadata/md5-cache/dev-python/seaborn-0.8.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/patsy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/statsmodels[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/seaborn/seaborn-0.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ca65f5f30410dd7fbccb3f8cb00c44a
+_md5_=1e8f8b4c89de2bcd527f648463c99ecb
diff --git a/metadata/md5-cache/dev-python/seaborn-0.9.0 b/metadata/md5-cache/dev-python/seaborn-0.9.0
index a207731fd884..ea26fb060376 100644
--- a/metadata/md5-cache/dev-python/seaborn-0.9.0
+++ b/metadata/md5-cache/dev-python/seaborn-0.9.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/patsy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/statsmodels[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/seaborn/seaborn-0.9.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ca65f5f30410dd7fbccb3f8cb00c44a
+_md5_=1e8f8b4c89de2bcd527f648463c99ecb
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.1.0 b/metadata/md5-cache/dev-python/secretstorage-3.1.0
index acfb6d648081..56f3b7149fbf 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.1.0
+++ b/metadata/md5-cache/dev-python/secretstorage-3.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jeepney[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ebfea0b138820e80db93b596c68dac63
+_md5_=a959d6c55454dd95906849f06c0403ef
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.1.1 b/metadata/md5-cache/dev-python/secretstorage-3.1.1
index dfe2b6645999..caeb192e9b8a 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.1.1
+++ b/metadata/md5-cache/dev-python/secretstorage-3.1.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jeepney[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.1.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ebfea0b138820e80db93b596c68dac63
+_md5_=a959d6c55454dd95906849f06c0403ef
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.6.0-r1 b/metadata/md5-cache/dev-python/semantic_version-2.6.0-r1
index 250ba794908d..116f075735e1 100644
--- a/metadata/md5-cache/dev-python/semantic_version-2.6.0-r1
+++ b/metadata/md5-cache/dev-python/semantic_version-2.6.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rbarrois/python-semanticversion/archive/v2.6.0.tar.gz -> semantic_version-2.6.0-1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36885e38916fe87da066b3b5f7e92098
+_md5_=8aed8abb9be811f338866e4150748e24
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.6.0-r2 b/metadata/md5-cache/dev-python/semantic_version-2.6.0-r2
index 2f3054e70822..f715fb730794 100644
--- a/metadata/md5-cache/dev-python/semantic_version-2.6.0-r2
+++ b/metadata/md5-cache/dev-python/semantic_version-2.6.0-r2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rbarrois/python-semanticversion/archive/v2.6.0.tar.gz -> semantic_version-2.6.0-1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=af0a2694e0e7344604602d8fba65ecd6
+_md5_=e86d8fa82d5caa5e36f724ee177b8971
diff --git a/metadata/md5-cache/dev-python/semver-2.8.1 b/metadata/md5-cache/dev-python/semver-2.8.1
index acf83f7bd362..cd617f0f0da7 100644
--- a/metadata/md5-cache/dev-python/semver-2.8.1
+++ b/metadata/md5-cache/dev-python/semver-2.8.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/k-bx/python-semver/archive/2.8.1.tar.gz -> semver-2.8.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c255c68798c77cae66366d1b1ce50b25
+_md5_=92c42273b3cc2c81e27c9a18248f6fb5
diff --git a/metadata/md5-cache/dev-python/serverfiles-0.2.1 b/metadata/md5-cache/dev-python/serverfiles-0.2.1
index 1320916f73e9..40a68dc6f228 100644
--- a/metadata/md5-cache/dev-python/serverfiles-0.2.1
+++ b/metadata/md5-cache/dev-python/serverfiles-0.2.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-python/requests-2.11.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/biolab/serverfiles/archive/0.2.1.tar.gz -> serverfiles-0.2.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b9c30cc12e6eb75c366715fb034c07f3
+_md5_=5b631e378939d7d0bf8539d0fbbc30be
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.10 b/metadata/md5-cache/dev-python/setproctitle-1.1.10
index 2b341328804d..ec8bc4559db5 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.10
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.10
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbf96e74aa60cd60623e705aa69fdabe
+_md5_=b24f06803b55c58ad849b7cfbf80ca84
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1 b/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
index f429a97853cf..fd0c6b9b9153 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.10.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6bffa9a65e1ec11cc3f477965ef72940
+_md5_=a057f3dd3554a39277606565ddd187b8
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.8 b/metadata/md5-cache/dev-python/setproctitle-1.1.8
index 868dd0694b9c..630deb44742a 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.8
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.8
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-m
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57e4cf7cde859e5340bc023da5c47f6e
+_md5_=17063c55c72dce7ee1bb9332cf42684f
diff --git a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1 b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
index ebf13fbf1c8b..fab36129911b 100644
--- a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
+++ b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tkf/sexpdata/archive/v0.0.3.tar.gz -> sexpdata-0.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f122fe82b32c1467fa7a54a2ae91e23
+_md5_=b1230cd19b5c6057042a84dfc81a86a8
diff --git a/metadata/md5-cache/dev-python/simplebayes-1.5.7 b/metadata/md5-cache/dev-python/simplebayes-1.5.7
index de68d85c8f71..865c631f39c2 100644
--- a/metadata/md5-cache/dev-python/simplebayes-1.5.7
+++ b/metadata/md5-cache/dev-python/simplebayes-1.5.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hickeroar/simplebayes/archive/1.5.7.tar.gz -> simplebayes-1.5.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08552e915314413ed27121942d863da6
+_md5_=2c97704726974bf6398f5c77de94fe39
diff --git a/metadata/md5-cache/dev-python/simples3-1.0 b/metadata/md5-cache/dev-python/simples3-1.0
index cf5a92f66b64..bab50cd4a38f 100644
--- a/metadata/md5-cache/dev-python/simples3-1.0
+++ b/metadata/md5-cache/dev-python/simples3-1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/simples3/simples3-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c244b6862420ee8db3c2ea7d72f507a
+_md5_=47628f0c2489fbdcb60fb75a56ee13da
diff --git a/metadata/md5-cache/dev-python/simpy-3.0.8 b/metadata/md5-cache/dev-python/simpy-3.0.8
index e9f0d437fd7e..dee505ccbc74 100644
--- a/metadata/md5-cache/dev-python/simpy-3.0.8
+++ b/metadata/md5-cache/dev-python/simpy-3.0.8
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) python_targets_python3_5? ( dev-lang/python:3.5[tk] ) python_targets_python3_6? ( dev-lang/python:3.6[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) python_targets_python3_5? ( dev-lang/python:3.5[tk] ) python_targets_python3_6? ( dev-lang/python:3.6[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpy/simpy-3.0.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b424c51c41b7895d51eaf775009e56d0
+_md5_=837438ab353163ea48ef6c353b562945
diff --git a/metadata/md5-cache/dev-python/slimit-0.8.1-r1 b/metadata/md5-cache/dev-python/slimit-0.8.1-r1
index aabb52c05527..113d4facfaf5 100644
--- a/metadata/md5-cache/dev-python/slimit-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/slimit-0.8.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/ply:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rspivak/slimit/archive/0.8.1.tar.gz -> slimit-0.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14cc11e600ed18d60d712e60660e2eea
+_md5_=1e1f7924042b156b25607ade2147b0c0
diff --git a/metadata/md5-cache/dev-python/slixmpp-1.4.0 b/metadata/md5-cache/dev-python/slixmpp-1.4.0
index 168032af3670..848bf1654eac 100644
--- a/metadata/md5-cache/dev-python/slixmpp-1.4.0
+++ b/metadata/md5-cache/dev-python/slixmpp-1.4.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/aiodns[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/slixmpp/slixmpp-1.4.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6e778fe9d741cdb2a0c5de506823de51
+_md5_=57a56f6b677e465818bb5931b3dcfa7e
diff --git a/metadata/md5-cache/dev-python/slixmpp-1.4.2 b/metadata/md5-cache/dev-python/slixmpp-1.4.2
index d4ce46c16f5d..958af528c90a 100644
--- a/metadata/md5-cache/dev-python/slixmpp-1.4.2
+++ b/metadata/md5-cache/dev-python/slixmpp-1.4.2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/aiodns[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/aiohttp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/slixmpp/slixmpp-1.4.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7e3b6cab4e1c561be7e9bb6f459bc50d
+_md5_=a6ffa6f3b7c166350ed59eda0b110ee2
diff --git a/metadata/md5-cache/dev-python/slixmpp-9999 b/metadata/md5-cache/dev-python/slixmpp-9999
index 0e5f1fdcdb78..d4d3c08f2dee 100644
--- a/metadata/md5-cache/dev-python/slixmpp-9999
+++ b/metadata/md5-cache/dev-python/slixmpp-9999
@@ -9,6 +9,7 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-python/aiodns[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/aiohttp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7e3b6cab4e1c561be7e9bb6f459bc50d
+_md5_=a6ffa6f3b7c166350ed59eda0b110ee2
diff --git a/metadata/md5-cache/dev-python/smmap-0.9.0 b/metadata/md5-cache/dev-python/smmap-0.9.0
index b00ecd1ee234..cba034c66dc6 100644
--- a/metadata/md5-cache/dev-python/smmap-0.9.0
+++ b/metadata/md5-cache/dev-python/smmap-0.9.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/smmap/smmap-0.9.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b422dfb65192d22fc1a26e92fcd58d8
+_md5_=aa8bc99f344b23ec6ec1438875699f43
diff --git a/metadata/md5-cache/dev-python/smmap2-2.0.3 b/metadata/md5-cache/dev-python/smmap2-2.0.3
index 4933e2ad7b5f..0cf1f2f09270 100644
--- a/metadata/md5-cache/dev-python/smmap2-2.0.3
+++ b/metadata/md5-cache/dev-python/smmap2-2.0.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 ~x86
 LICENSE=BSD
 RDEPEND=!dev-python/smmap[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/smmap2/smmap2-2.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e57008af5308d566d2d1cb85200d40a1
+_md5_=511a6ba2207cf7aa348145d804a9d371
diff --git a/metadata/md5-cache/dev-python/socketio-client-0.6.6 b/metadata/md5-cache/dev-python/socketio-client-0.6.6
index 3db77dbead8f..b7a7c20ff632 100644
--- a/metadata/md5-cache/dev-python/socketio-client-0.6.6
+++ b/metadata/md5-cache/dev-python/socketio-client-0.6.6
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketIO-client/socketIO_client-0.6.6.tar.gz -> socketio-client-0.6.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=747ab5a9b702f458168c6b5389c2e141
+_md5_=e29d5da3d4ab49f3cdc96af0fa76afaf
diff --git a/metadata/md5-cache/dev-python/socketpool-0.5.3 b/metadata/md5-cache/dev-python/socketpool-0.5.3
index fc16dcc11c17..109e5c76b35c 100644
--- a/metadata/md5-cache/dev-python/socketpool-0.5.3
+++ b/metadata/md5-cache/dev-python/socketpool-0.5.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~arm64 ppc ppc64 s390 ~sh ~sparc x86
 LICENSE=|| ( MIT public-domain )
 RDEPEND=python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketpool/socketpool-0.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68b35d5c2a2b6a357f647a7899bea2bc
+_md5_=52df6d8a44b39f7dc1892c95d3eb7459
diff --git a/metadata/md5-cache/dev-python/socketpool-0.5.3-r1 b/metadata/md5-cache/dev-python/socketpool-0.5.3-r1
index 94676b9f8541..2428175513ac 100644
--- a/metadata/md5-cache/dev-python/socketpool-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/socketpool-0.5.3-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( MIT public-domain )
 RDEPEND=python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketpool/socketpool-0.5.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7d5d37aa8e1ec110fccf2ad999847423
+_md5_=6caf8e1dfa5bfbdfe83aaf676fa83b7d
diff --git a/metadata/md5-cache/dev-python/sortedcollections-0.5.3 b/metadata/md5-cache/dev-python/sortedcollections-0.5.3
index 3b8886926c55..ed506463d1e9 100644
--- a/metadata/md5-cache/dev-python/sortedcollections-0.5.3
+++ b/metadata/md5-cache/dev-python/sortedcollections-0.5.3
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sortedcollections/sortedcollections-0.5.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=94409fbc32082753270eee6f80d42ec4
+_md5_=6083c191c6c02a94999c88abe7224b9a
diff --git a/metadata/md5-cache/dev-python/sortedcontainers-1.5.7 b/metadata/md5-cache/dev-python/sortedcontainers-1.5.7
index ea4c708b3e03..94800dc63a0b 100644
--- a/metadata/md5-cache/dev-python/sortedcontainers-1.5.7
+++ b/metadata/md5-cache/dev-python/sortedcontainers-1.5.7
@@ -9,7 +9,8 @@ KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sortedcontainers/sortedcontainers-1.5.7.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=49f9d9213a298326f41d90bce091ad27
+_md5_=5e468325010fe64384cf4a1d5638f6f9
diff --git a/metadata/md5-cache/dev-python/spark-parser-1.5.1-r1 b/metadata/md5-cache/dev-python/spark-parser-1.5.1-r1
index 8079c2454dea..2ae0a06d1bc2 100644
--- a/metadata/md5-cache/dev-python/spark-parser-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/spark-parser-1.5.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/spark_parser/spark_parser-1.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11526e2b61fa8a1510af600469eb4fd2
+_md5_=485d115a78a9df974458b795b504d5f7
diff --git a/metadata/md5-cache/dev-python/spark-parser-1.6.0 b/metadata/md5-cache/dev-python/spark-parser-1.6.0
index c2eeb443d489..ea13448fb085 100644
--- a/metadata/md5-cache/dev-python/spark-parser-1.6.0
+++ b/metadata/md5-cache/dev-python/spark-parser-1.6.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/spark_parser/spark_parser-1.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d18f0f73d435b705b4bed3d9dc9b3e6
+_md5_=f491093cbe342a7f474795244fa1808d
diff --git a/metadata/md5-cache/dev-python/spark-parser-1.6.1 b/metadata/md5-cache/dev-python/spark-parser-1.6.1
index 1fddd4220838..a7aa0cd30ae9 100644
--- a/metadata/md5-cache/dev-python/spark-parser-1.6.1
+++ b/metadata/md5-cache/dev-python/spark-parser-1.6.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/spark_parser/spark_parser-1.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d18f0f73d435b705b4bed3d9dc9b3e6
+_md5_=f491093cbe342a7f474795244fa1808d
diff --git a/metadata/md5-cache/dev-python/spark-parser-1.8.5 b/metadata/md5-cache/dev-python/spark-parser-1.8.5
index f4b6664027a5..e35c6ea3d1b4 100644
--- a/metadata/md5-cache/dev-python/spark-parser-1.8.5
+++ b/metadata/md5-cache/dev-python/spark-parser-1.8.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/spark_parser/spark_parser-1.8.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d18f0f73d435b705b4bed3d9dc9b3e6
+_md5_=f491093cbe342a7f474795244fa1808d
diff --git a/metadata/md5-cache/dev-python/speaklater-1.3-r1 b/metadata/md5-cache/dev-python/speaklater-1.3-r1
index 5d7955cf8804..95cab4cf6d2a 100644
--- a/metadata/md5-cache/dev-python/speaklater-1.3-r1
+++ b/metadata/md5-cache/dev-python/speaklater-1.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/speaklater/speaklater-1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7cfbff26374c177b7e211e847155727
+_md5_=fae1e992ca994796e83612db5f99005d
diff --git a/metadata/md5-cache/dev-python/spectral-cube-0.4.0 b/metadata/md5-cache/dev-python/spectral-cube-0.4.0
index af2b9e37b1d8..900ce900ccf2 100644
--- a/metadata/md5-cache/dev-python/spectral-cube-0.4.0
+++ b/metadata/md5-cache/dev-python/spectral-cube-0.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/spectral-cube/spectral-cube-0.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8707d6d6884b9d8982e9f2a11ff2c30
+_md5_=b3f4be90d97e18ad6c9f73698e21d0b3
diff --git a/metadata/md5-cache/dev-python/specutils-0.2 b/metadata/md5-cache/dev-python/specutils-0.2
index 4216183bc649..8c84254774c2 100644
--- a/metadata/md5-cache/dev-python/specutils-0.2
+++ b/metadata/md5-cache/dev-python/specutils-0.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/astropy/specutils/archive/v0.2.tar.gz -> specutils-0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=887e8972f948376a112e4690b7c9152e
+_md5_=53cb18c9ec3c8b69efee023a3d2d2047
diff --git a/metadata/md5-cache/dev-python/specutils-0.2.2 b/metadata/md5-cache/dev-python/specutils-0.2.2
index 70fa1c55027d..dba58dff2314 100644
--- a/metadata/md5-cache/dev-python/specutils-0.2.2
+++ b/metadata/md5-cache/dev-python/specutils-0.2.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/astropy/specutils/archive/v0.2.2.tar.gz -> specutils-0.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f19978c5d73aaf790c0f9be7b0a6e8ba
+_md5_=6721829bcc557fb9f2c79816c4bce7c7
diff --git a/metadata/md5-cache/dev-python/sphinx-jinja-0.2.1 b/metadata/md5-cache/dev-python/sphinx-jinja-0.2.1
index c238ea04596a..cfb51368f678 100644
--- a/metadata/md5-cache/dev-python/sphinx-jinja-0.2.1
+++ b/metadata/md5-cache/dev-python/sphinx-jinja-0.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-jinja/sphinx-jinja-0.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4b9513d0d4449aee065026cf6f597d7
+_md5_=4bc1f4f95b018ad69fac8e47c9bac8db
diff --git a/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0 b/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
index 8d68d640338f..227c8c1b8f57 100644
--- a/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
+++ b/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-jinja/sphinx-jinja-0.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4b9513d0d4449aee065026cf6f597d7
+_md5_=4bc1f4f95b018ad69fac8e47c9bac8db
diff --git a/metadata/md5-cache/dev-python/sphinx-testing-0.7.2 b/metadata/md5-cache/dev-python/sphinx-testing-0.7.2
index 91b8fda3949e..5c64426b69fc 100644
--- a/metadata/md5-cache/dev-python/sphinx-testing-0.7.2
+++ b/metadata/md5-cache/dev-python/sphinx-testing-0.7.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=BSD-2
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-testing/sphinx-testing-0.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8d4b64667bfed6044bb5ba0fa303da5
+_md5_=8d9106c2c53ecccbe422541e41c48f6a
diff --git a/metadata/md5-cache/dev-python/sphinx_celery-1.3.1 b/metadata/md5-cache/dev-python/sphinx_celery-1.3.1
index 2a8c399bd91c..82cc4057cdb2 100644
--- a/metadata/md5-cache/dev-python/sphinx_celery-1.3.1
+++ b/metadata/md5-cache/dev-python/sphinx_celery-1.3.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_celery/sphinx_celery-1.3.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1c230172f6b67658641d4ae2953d4fe4
+_md5_=0029c8d6a33a56841f0a371bffaafe2f
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
index ea28b46bfeeb..ba443a87afd3 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD-2
 RDEPEND=>=dev-python/requests-0.13[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b377de181477bf2fb4a2f4f1f70db534
+_md5_=7d4ad15a5ecfcdaf9e072b306c85e9b3
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
index cbcfa6e7984a..534997d033ea 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c76296e6e028303b5d9536586a7c81e
+_md5_=c647b18b0dfe87555f2da464b64d7c6f
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.5.2 b/metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.5.2
index e346f46bdadc..65a5988ecbb6 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.5.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.5.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4697e85663605371dc23f6470982c66e
+_md5_=62379e62190534b1337d2e7af63d7e61
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11 b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11
index 9febd17f71b4..473607c68ce7 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/namespace-sphinxcontrib[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0c8bf253b59aec7923aab9ada04683a
+_md5_=8c5620e4e6a501e48182385e9eee210b
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.8 b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.8
index f06d0a3c3680..bc495842e8c3 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.8
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.8
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/sphinx-1.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb5d46a86e828fd2a2dd7c1f249611b4
+_md5_=bce288abc5c148ee05d40114545462a1
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.1.2 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.1.2
index 03d7b0adab48..502b114fd0d4 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.1.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.1.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyenchant-1.6.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7eb66a1983089a0f008d5707900ccd3a
+_md5_=14b44df1cd075ffd0a99aaecaef12e45
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0 b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
index 9dc5dca1aa86..cca9841bdf94 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
@@ -9,7 +9,8 @@ LICENSE=BSD-2
 PDEPEND=>=dev-python/sphinx-1.5.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 RDEPEND=>=dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/namespace-sphinxcontrib[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99ad685fbd7cc8efcf3d4b360fff0797
+_md5_=d59ed5f32e3295da9f18f477b6f38be5
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.7.10 b/metadata/md5-cache/dev-python/sqlalchemy-0.7.10
index 2c359c7c9322..7c43e4020a51 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.7.10
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.7.10
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] mssql? ( dev-python/pymssql ) mysql? ( dev-python/mysql-python ) postgres? ( >=dev-python/psycopg-2 ) sqlite? ( >=dev-db/sqlite-3.3.13 ) python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.7.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8bbb52e05437eff4fa9ae8bd07f03aac
+_md5_=446949eb6ddf5e9c9a5826b3a86c9568
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.2.18 b/metadata/md5-cache/dev-python/sqlalchemy-1.2.18
index d2d2088185d7..f59bd44f0376 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.2.18
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.2.18
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.2.18.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=004b3dcdac42f6d03c025cd906a6cdc1
+_md5_=2255734fa0e31e01e913a44a5fcbe3dc
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.3 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.3
index f8c73c981c05..117fa7088b98 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.3
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.3
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=924cb486526c75d194c47b520e21ba34
+_md5_=8ef0906a182e7a41ce741753a9919d0f
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.4 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.4
index ee2faa26c1f8..47e6aeecb143 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.4
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.4
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1eebac811818959198bd3bd15e906ec7
+_md5_=9c239f3db80a6fdfebdd3e4501033084
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0 b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
index a061e7fe7842..731346c654f5 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
+++ b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rqlite/sqlalchemy-rqlite/archive/v1.0.tar.gz -> sqlalchemy-rqlite-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2abbfd767fee2efbf4f7cfd494dc5dfc
+_md5_=8575578fe053d5a032fce4e1dafd9b77
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999 b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
index 127fc7981d51..7b76d5f56973 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
+++ b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
@@ -8,6 +8,7 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d1b39f77aef656f24b016f27e21d640
+_md5_=d21dfd95da7f6e1cca2051e19c2fcfdd
diff --git a/metadata/md5-cache/dev-python/sqlite3dbm-0.1.4-r1 b/metadata/md5-cache/dev-python/sqlite3dbm-0.1.4-r1
index 98b144a99aa3..0398acc71efc 100644
--- a/metadata/md5-cache/dev-python/sqlite3dbm-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/sqlite3dbm-0.1.4-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Yelp/sqlite3dbm/archive/v0.1.4.tar.gz -> sqlite3dbm-0.1.4-git.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=159ac4040b71935d87bcde079751bd20
+_md5_=a09e87b8369d942bc3ae3ef70193208d
diff --git a/metadata/md5-cache/dev-python/statsd-3.2.1 b/metadata/md5-cache/dev-python/statsd-3.2.1
index f87b5fa475d1..98765ce284e2 100644
--- a/metadata/md5-cache/dev-python/statsd-3.2.1
+++ b/metadata/md5-cache/dev-python/statsd-3.2.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsd/statsd-3.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8cadc63c437b40379f4483649aa59c69
+_md5_=f378a8708cfe213a7154659be02c2fcb
diff --git a/metadata/md5-cache/dev-python/statsd-3.3.0 b/metadata/md5-cache/dev-python/statsd-3.3.0
index 5f859c0e8b24..da9ead12f258 100644
--- a/metadata/md5-cache/dev-python/statsd-3.3.0
+++ b/metadata/md5-cache/dev-python/statsd-3.3.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsd/statsd-3.3.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0b7ed87aab2dee38b814bdeb96629712
+_md5_=c310bbf2e4974b0961b0bcfcf699ecce
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.6.1 b/metadata/md5-cache/dev-python/statsmodels-0.6.1
index bde40cbdc367..f820b4d32dd0 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.6.1
+++ b/metadata/md5-cache/dev-python/statsmodels-0.6.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.5.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/patsy-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3650fbc6c463fd7d956b4f0008976435
+_md5_=aae79cec27dc2d39f2fbfb997cad8bd4
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.8.0 b/metadata/md5-cache/dev-python/statsmodels-0.8.0
index 04a61b75d772..a1c2ad05e707 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.8.0
+++ b/metadata/md5-cache/dev-python/statsmodels-0.8.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/patsy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8b364db35979225db02f1bb09ad0096
+_md5_=43f0388fd2280da5eba012cdbc93f5a7
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.9.0 b/metadata/md5-cache/dev-python/statsmodels-0.9.0
index 37c3067dbfd6..e86884e86104 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.9.0
+++ b/metadata/md5-cache/dev-python/statsmodels-0.9.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pandas-0.23.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/patsy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.9.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6b06efdedf4f4f62e75ec1e289a95382
+_md5_=d9f85fa21ca7132b9555095bf97bde04
diff --git a/metadata/md5-cache/dev-python/statsmodels-9999 b/metadata/md5-cache/dev-python/statsmodels-9999
index 8152195d7407..f59cac433bea 100644
--- a/metadata/md5-cache/dev-python/statsmodels-9999
+++ b/metadata/md5-cache/dev-python/statsmodels-9999
@@ -9,6 +9,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/patsy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=7c3f6fbf989259aa79511aac2450a213
+_md5_=f1cf4a85bda0e12cebe90360f1e1727f
diff --git a/metadata/md5-cache/dev-python/stevedore-1.25.1 b/metadata/md5-cache/dev-python/stevedore-1.25.1
index f38b390ef3b0..c3e95063a691 100644
--- a/metadata/md5-cache/dev-python/stevedore-1.25.1
+++ b/metadata/md5-cache/dev-python/stevedore-1.25.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stevedore/stevedore-1.25.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5bbe7353a2509aa6d1d9a21064101bb6
+_md5_=01a6e0779966db3d9aad281dd212ba78
diff --git a/metadata/md5-cache/dev-python/stevedore-1.28.0 b/metadata/md5-cache/dev-python/stevedore-1.28.0
index e0ac5ea61e18..edbdb8d00c4a 100644
--- a/metadata/md5-cache/dev-python/stevedore-1.28.0
+++ b/metadata/md5-cache/dev-python/stevedore-1.28.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stevedore/stevedore-1.28.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9edd76f8f9ed32e64e0badb41b36dbd
+_md5_=59effeaea62909084faada609dd1a6b1
diff --git a/metadata/md5-cache/dev-python/stevedore-1.30.1 b/metadata/md5-cache/dev-python/stevedore-1.30.1
index 4d8bff0e08f9..cb591e4516d5 100644
--- a/metadata/md5-cache/dev-python/stevedore-1.30.1
+++ b/metadata/md5-cache/dev-python/stevedore-1.30.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stevedore/stevedore-1.30.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=265e08de560dff9070226da5fc8a4935
+_md5_=77b8c9a59d7628fa46e26630c0a6a7a1
diff --git a/metadata/md5-cache/dev-python/storm-0.20-r1 b/metadata/md5-cache/dev-python/storm-0.20-r1
index 0877a39025f7..0830e3923af7 100644
--- a/metadata/md5-cache/dev-python/storm-0.20-r1
+++ b/metadata/md5-cache/dev-python/storm-0.20-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) postgres? ( =dev-python/psycopg-2*[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] >=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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/storm/trunk/0.20/+download/storm-0.20.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d573862f34c1043d9547595245ae6691
+_md5_=f8d9acb7d7634f7e8278e9d1129bff9e
diff --git a/metadata/md5-cache/dev-python/stripe-2.10.1 b/metadata/md5-cache/dev-python/stripe-2.10.1
index 8e84fb15b528..3225145655ab 100644
--- a/metadata/md5-cache/dev-python/stripe-2.10.1
+++ b/metadata/md5-cache/dev-python/stripe-2.10.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/requests-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/requests-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/requests-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/requests-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=dev-python/requests-2[ssl,python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/requests-2[ssl,python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stripe/stripe-2.10.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=80f11e791bfd3f24ef1344afa58ec2f7
+_md5_=b51e711cc7f384ae6584bea6d4f0d085
diff --git a/metadata/md5-cache/dev-python/stripe-2.3.0 b/metadata/md5-cache/dev-python/stripe-2.3.0
index d9c1ecfaa33a..c7b54fd7ea36 100644
--- a/metadata/md5-cache/dev-python/stripe-2.3.0
+++ b/metadata/md5-cache/dev-python/stripe-2.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/requests-0.8.8 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stripe/stripe-2.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8430e3dae1bb7c610bfe0feca2081be4
+_md5_=f1fe9cc59f0be525c6f32d3d6b2aaa39
diff --git a/metadata/md5-cache/dev-python/stripe-2.34.0 b/metadata/md5-cache/dev-python/stripe-2.34.0
index 2cb2c8735266..5011209802d9 100644
--- a/metadata/md5-cache/dev-python/stripe-2.34.0
+++ b/metadata/md5-cache/dev-python/stripe-2.34.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=dev-python/requests-2.20[ssl,python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/requests-2.20[ssl,python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stripe/stripe-2.34.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2be5ec2a08d5ae18e4d83399c4799e12
+_md5_=74e67cc211d1d55f0eecdd2c22b910c4
diff --git a/metadata/md5-cache/dev-python/subprocess32-3.2.7 b/metadata/md5-cache/dev-python/subprocess32-3.2.7
index 926f963da7d9..8bf541c2c59f 100644
--- a/metadata/md5-cache/dev-python/subprocess32-3.2.7
+++ b/metadata/md5-cache/dev-python/subprocess32-3.2.7
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=PSF-2
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/subprocess32/subprocess32-3.2.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1864f7aa691f36bbd173aca97c651421
+_md5_=f832408d6f736575fb4b2afe4f702661
diff --git a/metadata/md5-cache/dev-python/subprocess32-3.5.4 b/metadata/md5-cache/dev-python/subprocess32-3.5.4
index 14ab54b0de0b..ee458c738021 100644
--- a/metadata/md5-cache/dev-python/subprocess32-3.5.4
+++ b/metadata/md5-cache/dev-python/subprocess32-3.5.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=PSF-2
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/subprocess32/subprocess32-3.5.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1e834a57f76e341088e43daa0ceedd44
+_md5_=e8729b5342d579910e828177c0ebc2b3
diff --git a/metadata/md5-cache/dev-python/subunit-1.2.0-r1 b/metadata/md5-cache/dev-python/subunit-1.2.0-r1
index 004eb4b44e5e..5b4240b39ebf 100644
--- a/metadata/md5-cache/dev-python/subunit-1.2.0-r1
+++ b/metadata/md5-cache/dev-python/subunit-1.2.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=Apache-2.0 BSD
 RDEPEND=>=dev-python/testtools-0.9.34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/extras[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-lang/perl:= python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/subunit/trunk/1.2/+download/subunit-1.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=010ea8c86a62a21b645479557d676e41
+_md5_=8ed870fc145b9b73f05f9f5239fdccd2
diff --git a/metadata/md5-cache/dev-python/subvertpy-0.10.1 b/metadata/md5-cache/dev-python/subvertpy-0.10.1
index 05dc8c3eada0..56cfd80dd5f0 100644
--- a/metadata/md5-cache/dev-python/subvertpy-0.10.1
+++ b/metadata/md5-cache/dev-python/subvertpy-0.10.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-vcs/subversion-1.4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/subvertpy/subvertpy-0.10.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=750b9aca702f6eaffbd6ff7b5ac8aa77
+_md5_=4f8664d08af113550826120c2c3ba0e1
diff --git a/metadata/md5-cache/dev-python/subvertpy-0.9.1 b/metadata/md5-cache/dev-python/subvertpy-0.9.1
index e01a426bbc8e..510229d7e23b 100644
--- a/metadata/md5-cache/dev-python/subvertpy-0.9.1
+++ b/metadata/md5-cache/dev-python/subvertpy-0.9.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-vcs/subversion-1.4 python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.samba.org/~jelmer/subvertpy/subvertpy-0.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f309646b47c95be6d17f2d8a7ddb048f
+_md5_=e346ac8cdeec8691196dbbdd83133f23
diff --git a/metadata/md5-cache/dev-python/suds-0.6-r1 b/metadata/md5-cache/dev-python/suds-0.6-r1
index 51254c338cb5..d5dca5a44adc 100644
--- a/metadata/md5-cache/dev-python/suds-0.6-r1
+++ b/metadata/md5-cache/dev-python/suds-0.6-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=doc? ( python_targets_python2_7 ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/suds-jurko/suds-jurko-0.6.tar.bz2 -> suds-0.6.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1bf79074c5ac1b84f6b779dbd78ed5f7
+_md5_=65fe16c9d66b8f9beaa8e5bd0be0c3e8
diff --git a/metadata/md5-cache/dev-python/sunpy-0.8.0 b/metadata/md5-cache/dev-python/sunpy-0.8.0
index 79e448f564cd..ce9dbed27391 100644
--- a/metadata/md5-cache/dev-python/sunpy-0.8.0
+++ b/metadata/md5-cache/dev-python/sunpy-0.8.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/astropy-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/suds[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] jpeg2k? ( dev-python/glymur[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sunpy/sunpy-0.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7f5e110779851c7dc1587c11527bbec1
+_md5_=a2e3c3b40da3b1e4f7396755bfe2295b
diff --git a/metadata/md5-cache/dev-python/superlance-0.14 b/metadata/md5-cache/dev-python/superlance-0.14
index 7b2d99a04bb8..21617a55b8f0 100644
--- a/metadata/md5-cache/dev-python/superlance-0.14
+++ b/metadata/md5-cache/dev-python/superlance-0.14
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=repoze
 RDEPEND=app-admin/supervisor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/superlance/superlance-0.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b54cfe1f92390135db5187c390a6d270
+_md5_=5d94ed2a9bb9423aeef22f0ab90de6b1
diff --git a/metadata/md5-cache/dev-python/superlance-1.0.0 b/metadata/md5-cache/dev-python/superlance-1.0.0
index 04e4ab0afeb4..0008a62b2783 100644
--- a/metadata/md5-cache/dev-python/superlance-1.0.0
+++ b/metadata/md5-cache/dev-python/superlance-1.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=repoze
 RDEPEND=app-admin/supervisor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/superlance/superlance-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b54cfe1f92390135db5187c390a6d270
+_md5_=5d94ed2a9bb9423aeef22f0ab90de6b1
diff --git a/metadata/md5-cache/dev-python/sure-1.2.24 b/metadata/md5-cache/dev-python/sure-1.2.24
index a8522665bc6a..46b6c4ec430f 100644
--- a/metadata/md5-cache/dev-python/sure-1.2.24
+++ b/metadata/md5-cache/dev-python/sure-1.2.24
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-1.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/rednose-0.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sure/sure-1.2.24.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9af7b9d3936e8a8cd2c8750d76c5422b
+_md5_=fa7a3becae9f64ab5f54232c3c926a06
diff --git a/metadata/md5-cache/dev-python/sure-1.2.5-r1 b/metadata/md5-cache/dev-python/sure-1.2.5-r1
index 4345b01937f2..47a29809c2aa 100644
--- a/metadata/md5-cache/dev-python/sure-1.2.5-r1
+++ b/metadata/md5-cache/dev-python/sure-1.2.5-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-python/nose-1.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/rednose-0.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gabrielfalcao/sure/archive/1.2.5.tar.gz -> sure-1.2.5-r1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c4f15e18b499ad53bc362216a3a24e83
+_md5_=9090af4c713b6fdabac1f7700eccd96e
diff --git a/metadata/md5-cache/dev-python/svgwrite-1.2.1 b/metadata/md5-cache/dev-python/svgwrite-1.2.1
index bdbbdd4fff60..9a6e5dfcb8ec 100644
--- a/metadata/md5-cache/dev-python/svgwrite-1.2.1
+++ b/metadata/md5-cache/dev-python/svgwrite-1.2.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pyparsing-2.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mozman/svgwrite/archive/v1.2.1.tar.gz -> svgwrite-1.2.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c46b705951ac8f6270b1438f0837444d
+_md5_=20c6155b61be189bd0a81bfe0134e53b
diff --git a/metadata/md5-cache/dev-python/symengine-0.3.0 b/metadata/md5-cache/dev-python/symengine-0.3.0
index d1a1f688781f..864648d76293 100644
--- a/metadata/md5-cache/dev-python/symengine-0.3.0
+++ b/metadata/md5-cache/dev-python/symengine-0.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/symengine python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symengine/symengine.py/archive/v0.3.0.tar.gz -> symengine.py-0.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f7f2d0ae10245a8558f4b1695c20e95
+_md5_=08ca6a488068b9df0c6d267e8468ff43
diff --git a/metadata/md5-cache/dev-python/sympy-1.0-r1 b/metadata/md5-cache/dev-python/sympy-1.0-r1
index 848b9724de95..d0f9374ccb9c 100644
--- a/metadata/md5-cache/dev-python/sympy-1.0-r1
+++ b/metadata/md5-cache/dev-python/sympy-1.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/pexpect-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) imaging? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ipython? ( python_targets_python3_5? ( dev-python/ipython[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/ipython[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/ipython[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) pyglet? ( python_targets_python2_7? ( dev-python/pyglet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) texmacs? ( app-office/texmacs ) theano? ( python_targets_python2_7? ( dev-python/theano[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) doc? ( || ( python_targets_python2_7 ) ) ipython? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/releases/download/sympy-1.0/sympy-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3347d09dc236758f5b3d0731cea0617b
+_md5_=eb44965634667ba6427af41eefd10573
diff --git a/metadata/md5-cache/dev-python/tempita-0.5.3-r2 b/metadata/md5-cache/dev-python/tempita-0.5.3-r2
index cf981b2d5a44..f68cd7140444 100644
--- a/metadata/md5-cache/dev-python/tempita-0.5.3-r2
+++ b/metadata/md5-cache/dev-python/tempita-0.5.3-r2
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ianb/tempita/get/97392d008cc8.tar.gz -> tempita-0.5.3-bitbucket.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9db4cffa3840174d2bbcf705f54aaa6d
+_md5_=d21af5448168654752c3aa223b3b7d9c
diff --git a/metadata/md5-cache/dev-python/tempora-1.12 b/metadata/md5-cache/dev-python/tempora-1.12
index 1d4aced72df8..5fb5ac20d555 100644
--- a/metadata/md5-cache/dev-python/tempora-1.12
+++ b/metadata/md5-cache/dev-python/tempora-1.12
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-1.12.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=708c7d6aae8065b075713ce41cf9e794
+_md5_=74a67d2c4aaf3e67eb15e36538f87ca1
diff --git a/metadata/md5-cache/dev-python/tempora-1.14 b/metadata/md5-cache/dev-python/tempora-1.14
index 7e48ffd7e008..c2c0fe2d3785 100644
--- a/metadata/md5-cache/dev-python/tempora-1.14
+++ b/metadata/md5-cache/dev-python/tempora-1.14
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-1.14.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=79022fe36c2d1a8908c3bc11fb262e0b
+_md5_=dcdaea9e654e64ece3d62be30d28c286
diff --git a/metadata/md5-cache/dev-python/tempora-1.14.1 b/metadata/md5-cache/dev-python/tempora-1.14.1
index e2a4aee60253..96562dec7ab1 100644
--- a/metadata/md5-cache/dev-python/tempora-1.14.1
+++ b/metadata/md5-cache/dev-python/tempora-1.14.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-1.14.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f0d12a0e04b8af4ff3f0b3c349191a9d
+_md5_=580fe60146edfd18a3abb56254adaa93
diff --git a/metadata/md5-cache/dev-python/tempora-1.7 b/metadata/md5-cache/dev-python/tempora-1.7
index ecb4d3fcf686..0ff9a612901f 100644
--- a/metadata/md5-cache/dev-python/tempora-1.7
+++ b/metadata/md5-cache/dev-python/tempora-1.7
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-1.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25063537842e3b9d7a05d930519789f2
+_md5_=0626f8db71cdbec5bc844c3f4a372882
diff --git a/metadata/md5-cache/dev-python/terminado-0.5 b/metadata/md5-cache/dev-python/terminado-0.5
index 935358c478b7..1686a14807f4 100644
--- a/metadata/md5-cache/dev-python/terminado-0.5
+++ b/metadata/md5-cache/dev-python/terminado-0.5
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1a059f1c016eaea0c4c8199ba32e1fa
+_md5_=87b956e659d48fc937b700a0be5bf708
diff --git a/metadata/md5-cache/dev-python/terminado-0.6 b/metadata/md5-cache/dev-python/terminado-0.6
index 4522888cad72..ea03e38bfac3 100644
--- a/metadata/md5-cache/dev-python/terminado-0.6
+++ b/metadata/md5-cache/dev-python/terminado-0.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8ff60396733fd5fb12eb3e0639b39f1
+_md5_=f49eeade3cf412b8aab64ec806c75e13
diff --git a/metadata/md5-cache/dev-python/terminado-0.8.1 b/metadata/md5-cache/dev-python/terminado-0.8.1
index 2c75c17cc9e2..78455f93fe22 100644
--- a/metadata/md5-cache/dev-python/terminado-0.8.1
+++ b/metadata/md5-cache/dev-python/terminado-0.8.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ec5f32c9263cae89e105bbb64500dc3b
+_md5_=4a58ee4acc73defeec9bec5b923cc7e6
diff --git a/metadata/md5-cache/dev-python/testfixtures-4.9.1 b/metadata/md5-cache/dev-python/testfixtures-4.9.1
index 976bbabe1d7f..8339e0404f82 100644
--- a/metadata/md5-cache/dev-python/testfixtures-4.9.1
+++ b/metadata/md5-cache/dev-python/testfixtures-4.9.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testfixtures/testfixtures-4.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71cbb63b210ed45225712159f5a18ceb
+_md5_=2630c06eae7b41f471b38e75389cf62a
diff --git a/metadata/md5-cache/dev-python/testfixtures-6.8.2 b/metadata/md5-cache/dev-python/testfixtures-6.8.2
index 93c76d8b43b9..d202067b1739 100644
--- a/metadata/md5-cache/dev-python/testfixtures-6.8.2
+++ b/metadata/md5-cache/dev-python/testfixtures-6.8.2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testfixtures/testfixtures-6.8.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=17dd8c3d9f79965ef9984ceb5fb92b0f
+_md5_=40c31d1fb9fa82fb2d2ccfabcb7ba948
diff --git a/metadata/md5-cache/dev-python/testify-0.11.0 b/metadata/md5-cache/dev-python/testify-0.11.0
index bb1f39126189..d9007f40d579 100644
--- a/metadata/md5-cache/dev-python/testify-0.11.0
+++ b/metadata/md5-cache/dev-python/testify-0.11.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.7.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testify/testify-0.11.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63428afba5b901193381607a631d7b56
+_md5_=c88ffd8ae12a08e5ccc688f517450848
diff --git a/metadata/md5-cache/dev-python/testpath-0.3.1 b/metadata/md5-cache/dev-python/testpath-0.3.1
index 7b27be5a448c..6f043a7e169b 100644
--- a/metadata/md5-cache/dev-python/testpath-0.3.1
+++ b/metadata/md5-cache/dev-python/testpath-0.3.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/testpath/archive/0.3.1.tar.gz -> testpath-0.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc65f572ef99092f75b5a2e5fa07f5b1
+_md5_=c48df496f3cc66ddabfe228185fd4700
diff --git a/metadata/md5-cache/dev-python/testrepository-0.0.18-r1 b/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
index e22cf8c0f5ca..182a51ce7fc6 100644
--- a/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/subunit-0.0.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-0.9.30[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/fixtures[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testrepository/testrepository-0.0.18.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08cfff54c31a14bafb72649cffcae52a
+_md5_=da51b72812b6bd61737cd5d224a34eba
diff --git a/metadata/md5-cache/dev-python/testrepository-0.0.20 b/metadata/md5-cache/dev-python/testrepository-0.0.20
index cfaf17a2e1f7..41ce0e2a46ea 100644
--- a/metadata/md5-cache/dev-python/testrepository-0.0.20
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.20
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/subunit-0.0.18[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-0.9.30[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/fixtures[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testrepository/testrepository-0.0.20.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db3bed9bd9be7c98167e5c397bdf486e
+_md5_=e466e328e99baa1f99a57080962e42fe
diff --git a/metadata/md5-cache/dev-python/testresources-0.2.7-r2 b/metadata/md5-cache/dev-python/testresources-0.2.7-r2
index 1925f33771c4..aed6fce3ba8e 100644
--- a/metadata/md5-cache/dev-python/testresources-0.2.7-r2
+++ b/metadata/md5-cache/dev-python/testresources-0.2.7-r2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testresources/testresources-0.2.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90d2030f1453745994564e5bf47418cc
+_md5_=6d5c37e2e3870f0a1dd20274e60062fe
diff --git a/metadata/md5-cache/dev-python/testresources-1.0.0 b/metadata/md5-cache/dev-python/testresources-1.0.0
index 7366c660e06b..4a89a2c44cd7 100644
--- a/metadata/md5-cache/dev-python/testresources-1.0.0
+++ b/metadata/md5-cache/dev-python/testresources-1.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testresources/testresources-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a909361dbbf7e8528cd9af0dec34e614
+_md5_=af80b0a54beaf722c9181cc4c467b3b6
diff --git a/metadata/md5-cache/dev-python/testresources-2.0.1 b/metadata/md5-cache/dev-python/testresources-2.0.1
index c80787533d9b..f0b7679f1699 100644
--- a/metadata/md5-cache/dev-python/testresources-2.0.1
+++ b/metadata/md5-cache/dev-python/testresources-2.0.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testresources/testresources-2.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1162fc2899941f8197d014275ee1b3f
+_md5_=2e2cdd05c8cc2162de8fd1d05259b1a5
diff --git a/metadata/md5-cache/dev-python/testscenarios-0.5.0 b/metadata/md5-cache/dev-python/testscenarios-0.5.0
index 79155e6b14f6..fe6d95cbef10 100644
--- a/metadata/md5-cache/dev-python/testscenarios-0.5.0
+++ b/metadata/md5-cache/dev-python/testscenarios-0.5.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=Apache-2.0
 RDEPEND=dev-python/testtools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testscenarios/testscenarios-0.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9debd7e66dfbdd806c68fdeedb781583
+_md5_=ba12172dee3c3c5cc962e28ba1e307a6
diff --git a/metadata/md5-cache/dev-python/testtools-2.3.0 b/metadata/md5-cache/dev-python/testtools-2.3.0
index b5416fd01b57..661c0e49c58d 100644
--- a/metadata/md5-cache/dev-python/testtools-2.3.0
+++ b/metadata/md5-cache/dev-python/testtools-2.3.0
@@ -9,7 +9,8 @@ LICENSE=MIT
 PDEPEND=>=dev-python/fixtures-1.3.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 RDEPEND=>=dev-python/extras-1.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mimeparse[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrsistent[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/unittest2-1.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testtools/testtools-2.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d710764c35f8a8b7ccd8399c4e3ffed
+_md5_=87cb3124ea80b02994a4a00479cd1243
diff --git a/metadata/md5-cache/dev-python/tgmochikit-1.4.2-r1 b/metadata/md5-cache/dev-python/tgmochikit-1.4.2-r1
index f595b6118eaa..1ff0ddec995c 100644
--- a/metadata/md5-cache/dev-python/tgmochikit-1.4.2-r1
+++ b/metadata/md5-cache/dev-python/tgmochikit-1.4.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( AFL-2.1 MIT )
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tgMochiKit/tgMochiKit-1.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dcfc87a7ba53d812a93d75dc3b70f61f
+_md5_=d023615083b56abf781566a261c1b4c2
diff --git a/metadata/md5-cache/dev-python/theano-0.7.0 b/metadata/md5-cache/dev-python/theano-0.7.0
index aad22978b975..357d2c8ac108 100644
--- a/metadata/md5-cache/dev-python/theano-0.7.0
+++ b/metadata/md5-cache/dev-python/theano-0.7.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.6.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-libs/scipy-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-0.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=697f4dca2f5c9abff03bcc4dad980a38
+_md5_=b8df11bbc55110797ef630c4d13a12c4
diff --git a/metadata/md5-cache/dev-python/theano-0.8.2 b/metadata/md5-cache/dev-python/theano-0.8.2
index 4cd6da6282f0..e01f9e519179 100644
--- a/metadata/md5-cache/dev-python/theano-0.8.2
+++ b/metadata/md5-cache/dev-python/theano-0.8.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-0.8.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae18bf24f9f9e65c5a715f54a0274d18
+_md5_=7828218ae85c56406f0aabed82141a20
diff --git a/metadata/md5-cache/dev-python/theano-0.9.0 b/metadata/md5-cache/dev-python/theano-0.9.0
index b7615eab948e..c677b2dcb954 100644
--- a/metadata/md5-cache/dev-python/theano-0.9.0
+++ b/metadata/md5-cache/dev-python/theano-0.9.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-0.9.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5aaa4a67fa75cb6ceee030625e64fe6b
+_md5_=b8a4dd8d2b31b99653bc176a9d207f04
diff --git a/metadata/md5-cache/dev-python/timelib-0.2.4-r1 b/metadata/md5-cache/dev-python/timelib-0.2.4-r1
index 1353e316d46b..66b20e5473a4 100644
--- a/metadata/md5-cache/dev-python/timelib-0.2.4-r1
+++ b/metadata/md5-cache/dev-python/timelib-0.2.4-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=PHP-3.01 ZLIB
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pediapress/timelib/archive/0.2.4.tar.gz -> timelib-0.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1e47eac97b8f633398ae19f1307c3f0
+_md5_=15ea4b39dcc7e300727d1244fa510a9a
diff --git a/metadata/md5-cache/dev-python/tinycss2-1.0.2 b/metadata/md5-cache/dev-python/tinycss2-1.0.2
index 9a39839f91a3..2cb053144227 100644
--- a/metadata/md5-cache/dev-python/tinycss2-1.0.2
+++ b/metadata/md5-cache/dev-python/tinycss2-1.0.2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/webencodings-0.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss2/tinycss2-1.0.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3b20355124a94773e7f83001ba21dd21
+_md5_=d5dd1dbd741a34b0c9b8e0a86e519f03
diff --git a/metadata/md5-cache/dev-python/toro-1.0.1 b/metadata/md5-cache/dev-python/toro-1.0.1
index 944b23a12319..f5f0668e8a91 100644
--- a/metadata/md5-cache/dev-python/toro-1.0.1
+++ b/metadata/md5-cache/dev-python/toro-1.0.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/toro/toro-1.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=70bb4b638fb4d4592626ba148dbf714d
+_md5_=214596fec918a72c0b0ec7eea333c0e5
diff --git a/metadata/md5-cache/dev-python/tqdm-4.33.0 b/metadata/md5-cache/dev-python/tqdm-4.33.0
index c4298851a7d7..2897d0661267 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.33.0
+++ b/metadata/md5-cache/dev-python/tqdm-4.33.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~hppa ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tqdm/tqdm-4.33.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8f7ef6c61d07dbcfd782e3a0c478f4fc
+_md5_=afcc4d0538cf9457ccff8400abc88963
diff --git a/metadata/md5-cache/dev-python/traitlets-4.3.2 b/metadata/md5-cache/dev-python/traitlets-4.3.2
index eb1ba0558c79..11514451fce7 100644
--- a/metadata/md5-cache/dev-python/traitlets-4.3.2
+++ b/metadata/md5-cache/dev-python/traitlets-4.3.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/traitlets/traitlets-4.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d6d11870302e06d9b1fa07674c4cb19a
+_md5_=aa62c3d729e9a14591d40a06e6526516
diff --git a/metadata/md5-cache/dev-python/treq-0.2.1 b/metadata/md5-cache/dev-python/treq-0.2.1
index 783053fc5348..af4a61cd49fb 100644
--- a/metadata/md5-cache/dev-python/treq-0.2.1
+++ b/metadata/md5-cache/dev-python/treq-0.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-12.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-web-12.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-0.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4f1b18808e5addd9f3f3f2848d50a81
+_md5_=b52ac7c2a4aa047e8c69763ec76056fd
diff --git a/metadata/md5-cache/dev-python/treq-16.12.0 b/metadata/md5-cache/dev-python/treq-16.12.0
index 2b0b6044e8f7..35aea28d7be9 100644
--- a/metadata/md5-cache/dev-python/treq-16.12.0
+++ b/metadata/md5-cache/dev-python/treq-16.12.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pyopenssl-0.15.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-16.0.0[crypt,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/service_identity-14.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/incremental[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-16.12.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef9a68c0c48934d9702b37e8ea4e6e03
+_md5_=fece05ef57ec6dd599b9b3deb9ba6589
diff --git a/metadata/md5-cache/dev-python/treq-17.3.1 b/metadata/md5-cache/dev-python/treq-17.3.1
index f94388f96d3d..f73c1dd98631 100644
--- a/metadata/md5-cache/dev-python/treq-17.3.1
+++ b/metadata/md5-cache/dev-python/treq-17.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/incremental[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.4.0[crypt,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-17.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae2cbf70160d0729a1f22977872e92f0
+_md5_=c274f3acd80f86da7a92175761a1e6da
diff --git a/metadata/md5-cache/dev-python/treq-17.8.0 b/metadata/md5-cache/dev-python/treq-17.8.0
index 7c0e4ce75328..d0c0dc4740ec 100644
--- a/metadata/md5-cache/dev-python/treq-17.8.0
+++ b/metadata/md5-cache/dev-python/treq-17.8.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/incremental[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.4.0[crypt,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-17.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34c506735db570c98e43c454dae578b2
+_md5_=7b704a0ecee477e09c194469f6a89e51
diff --git a/metadata/md5-cache/dev-python/turbocheetah-1.0-r1 b/metadata/md5-cache/dev-python/turbocheetah-1.0-r1
index d6f941e2e683..1ebd53eaa487 100644
--- a/metadata/md5-cache/dev-python/turbocheetah-1.0-r1
+++ b/metadata/md5-cache/dev-python/turbocheetah-1.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/cheetah-2.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/T/TurboCheetah/TurboCheetah-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5b6a35c87ce0b944e9172573af89c5b
+_md5_=5790afc0662ffcaaeacba18d1e0b4d8c
diff --git a/metadata/md5-cache/dev-python/turbokid-1.0.5-r1 b/metadata/md5-cache/dev-python/turbokid-1.0.5-r1
index 91a633c6717c..fa947be36738 100644
--- a/metadata/md5-cache/dev-python/turbokid-1.0.5-r1
+++ b/metadata/md5-cache/dev-python/turbokid-1.0.5-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/kid-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/T/TurboKid/TurboKid-1.0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8f213fb9f566fa0275bf3d2f12d0554
+_md5_=020c5978422515b428d6425683bcd772
diff --git a/metadata/md5-cache/dev-python/twine-1.11.0 b/metadata/md5-cache/dev-python/twine-1.11.0
index ae059909232d..0bbee80cf4b6 100644
--- a/metadata/md5-cache/dev-python/twine-1.11.0
+++ b/metadata/md5-cache/dev-python/twine-1.11.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tqdm-4.14[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pkginfo-1.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/twine/archive/1.11.0.tar.gz -> twine-1.11.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be08c02d8f16c752e85be9abb908f19e
+_md5_=8acd6894959e4e4fe048bbec4eb522bf
diff --git a/metadata/md5-cache/dev-python/twisted-core-15.2.1 b/metadata/md5-cache/dev-python/twisted-core-15.2.1
index c14e426513d5..4da69b850059 100644
--- a/metadata/md5-cache/dev-python/twisted-core-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-core-15.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=MIT
 RDEPEND=>=dev-python/zope-interface-3.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Core/15.2/TwistedCore-15.2.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb99f00d9988601765e81a6db2f823db
+_md5_=0c9f6d0edfecc4d48f9c5a831948e5be
diff --git a/metadata/md5-cache/dev-python/txaio-2.7.1 b/metadata/md5-cache/dev-python/txaio-2.7.1
index c1ab61b0ee87..d7a97827f00a 100644
--- a/metadata/md5-cache/dev-python/txaio-2.7.1
+++ b/metadata/md5-cache/dev-python/txaio-2.7.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/txaio/txaio-2.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=37e0e96b05d43d6fb5db65e1ce7dddcc
+_md5_=26bf9b5f8510c37e1e708ded83c3e2ac
diff --git a/metadata/md5-cache/dev-python/txaio-2.9.0 b/metadata/md5-cache/dev-python/txaio-2.9.0
index 399c2420979e..e6a38f3f5284 100644
--- a/metadata/md5-cache/dev-python/txaio-2.9.0
+++ b/metadata/md5-cache/dev-python/txaio-2.9.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/txaio/txaio-2.9.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36921172533df1015c4dd8bc0ee155be
+_md5_=eff91df3ce61dacf89f55d34f77d4419
diff --git a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1 b/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
index 7d173cfc385b..621c45b573c4 100644
--- a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
+++ b/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=|| ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ( >=dev-python/twisted-core-12.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-web-12.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomprince/txgithub/archive/15.0.0.tar.gz -> txgithub-15.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b87902e0e0332730580331bd2054f742
+_md5_=b946eaf797f8d6d7fe1a7d4169f846c5
diff --git a/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1 b/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
index d3846b94fe23..7ef8ef996d24 100644
--- a/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
+++ b/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
 RDEPEND=dev-python/automat[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/incremental[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),crypt] >=dev-python/zope-interface-3.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/automat[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/repoze-sphinx-autointerface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-3.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/txtorcon/txtorcon-0.19.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0b7f9518e7e4f1af04eb8e1d8104e55
+_md5_=4033bd3129e2ca4b2fdb41ee5031e3e2
diff --git a/metadata/md5-cache/dev-python/ufoLib-3.0.0 b/metadata/md5-cache/dev-python/ufoLib-3.0.0
index 424983b12268..1f74a9b1c3ec 100644
--- a/metadata/md5-cache/dev-python/ufoLib-3.0.0
+++ b/metadata/md5-cache/dev-python/ufoLib-3.0.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-python/fonttools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/fs[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unified-font-object/ufoLib/archive/v3.0.0.tar.gz -> ufoLib-3.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=74444c4397f672097bbebbe305989603
+_md5_=7c3f6e8b3ada9f8968aa8229dc314ffb
diff --git a/metadata/md5-cache/dev-python/ujson-1.33 b/metadata/md5-cache/dev-python/ujson-1.33
index 12b95ccb5fb1..41d168935164 100644
--- a/metadata/md5-cache/dev-python/ujson-1.33
+++ b/metadata/md5-cache/dev-python/ujson-1.33
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-1.33.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b6dc2ddcd118c36cce9a391be629374a
+_md5_=9898056f0e95f1ff7dc251b3a3e9fb21
diff --git a/metadata/md5-cache/dev-python/uncertainties-3.0.1 b/metadata/md5-cache/dev-python/uncertainties-3.0.1
index feaaed8d78ec..cb40ba9ae5cf 100644
--- a/metadata/md5-cache/dev-python/uncertainties-3.0.1
+++ b/metadata/md5-cache/dev-python/uncertainties-3.0.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uncertainties/uncertainties-3.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cbbcf0b4dbe89aeecf0e2bd768b8fce
+_md5_=c4d7670a82b0cd8d28089bb210118b2f
diff --git a/metadata/md5-cache/dev-python/uncompyle6-2.10.1 b/metadata/md5-cache/dev-python/uncompyle6-2.10.1
index bdb2484c8690..b57f7b3b2713 100644
--- a/metadata/md5-cache/dev-python/uncompyle6-2.10.1
+++ b/metadata/md5-cache/dev-python/uncompyle6-2.10.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/xdis-3.3.1 <dev-python/xdis-3.4.0 >=dev-python/spark-parser-1.6.1 <dev-python/spark-parser-1.7.0 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uncompyle6/uncompyle6-2.10.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29c5d3fa1fabc6887c955c23ebf382c6
+_md5_=22569ecc826b92e1abbefc9e660cfc34
diff --git a/metadata/md5-cache/dev-python/uranium-3.6.0-r1 b/metadata/md5-cache/dev-python/uranium-3.6.0-r1
index 528d74c7cc57..2b3028662651 100644
--- a/metadata/md5-cache/dev-python/uranium-3.6.0-r1
+++ b/metadata/md5-cache/dev-python/uranium-3.6.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-3.6.0:=[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sci-libs/Shapely[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Uranium/archive/3.6.0.tar.gz -> uranium-3.6.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd538b24b68162f69b5eb603836dc9cc
+_md5_=1a27d61461af20d6ae29814feab80b9e
diff --git a/metadata/md5-cache/dev-python/uranium-4.2.0 b/metadata/md5-cache/dev-python/uranium-4.2.0
index 9f9cfe509cff..947e2fdafcf4 100644
--- a/metadata/md5-cache/dev-python/uranium-4.2.0
+++ b/metadata/md5-cache/dev-python/uranium-4.2.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-4.2.0:=[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sci-libs/Shapely[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Uranium/archive/4.2.0.tar.gz -> uranium-4.2.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb60034ea6558fd1b1c23d30dbfaedc8
+_md5_=0129b2e72c52b17e0d26f2728bdded43
diff --git a/metadata/md5-cache/dev-python/uranium-4.3.0 b/metadata/md5-cache/dev-python/uranium-4.3.0
index 2e82543287af..f5ca30ec9540 100644
--- a/metadata/md5-cache/dev-python/uranium-4.3.0
+++ b/metadata/md5-cache/dev-python/uranium-4.3.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-4.3.0:=[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sci-libs/Shapely[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Uranium/archive/4.3.0.tar.gz -> uranium-4.3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fe65ab5797e7934c4d669c1161b695f
+_md5_=71b5aea5b041166ac9ec324b2346d463
diff --git a/metadata/md5-cache/dev-python/urdf_parser_py-0.4.0 b/metadata/md5-cache/dev-python/urdf_parser_py-0.4.0
index 22a2b2cd94ca..15fdea7ee131 100644
--- a/metadata/md5-cache/dev-python/urdf_parser_py-0.4.0
+++ b/metadata/md5-cache/dev-python/urdf_parser_py-0.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/catkin_pkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf_parser_py/archive/0.4.0.tar.gz -> urdf_parser_py-0.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b17a187b75fe5afbcc92920f6fdca1d4
+_md5_=dfbc4c6f766b38976feac5cce28fab8b
diff --git a/metadata/md5-cache/dev-python/uvloop-0.8.1 b/metadata/md5-cache/dev-python/uvloop-0.8.1
index 0cae19974137..f8f1bd027ac9 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.8.1
+++ b/metadata/md5-cache/dev-python/uvloop-0.8.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e205ac5dcfc61dc4aca6ccc885cbc46
+_md5_=fba5e1ad9950135f6557945508042b24
diff --git a/metadata/md5-cache/dev-python/vatnumber-1.1-r1 b/metadata/md5-cache/dev-python/vatnumber-1.1-r1
index c9d5972f7367..6caad1fb976a 100644
--- a/metadata/md5-cache/dev-python/vatnumber-1.1-r1
+++ b/metadata/md5-cache/dev-python/vatnumber-1.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=vies? ( dev-python/suds[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vatnumber/vatnumber-1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c71a50517ba1c4c1f5ddcdfd6e589723
+_md5_=864f8fae135e361b33a0d9efa6b59c7b
diff --git a/metadata/md5-cache/dev-python/vcrpy-1.10.3 b/metadata/md5-cache/dev-python/vcrpy-1.10.3
index b2696d756f4a..c7520f19aa14 100644
--- a/metadata/md5-cache/dev-python/vcrpy-1.10.3
+++ b/metadata/md5-cache/dev-python/vcrpy-1.10.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/urllib3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/wrapt[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vcrpy/vcrpy-1.10.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad66f4c4f36d5459f4da09bf670aa87e
+_md5_=4e888807ebbf800e441816a71ba8a470
diff --git a/metadata/md5-cache/dev-python/vcrpy-1.11.1 b/metadata/md5-cache/dev-python/vcrpy-1.11.1
index 0a8638138d98..a12434540528 100644
--- a/metadata/md5-cache/dev-python/vcrpy-1.11.1
+++ b/metadata/md5-cache/dev-python/vcrpy-1.11.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_5? ( dev-python/yarl[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/yarl[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vcrpy/vcrpy-1.11.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79335b4f3b3597c63c0ebdfcb52a2c71
+_md5_=b16948994ea1b9ab9f1074de66d3d7ac
diff --git a/metadata/md5-cache/dev-python/vcrpy-1.12.0 b/metadata/md5-cache/dev-python/vcrpy-1.12.0
index 5db3f5a014d3..843fd032a211 100644
--- a/metadata/md5-cache/dev-python/vcrpy-1.12.0
+++ b/metadata/md5-cache/dev-python/vcrpy-1.12.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_5? ( dev-python/yarl[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/yarl[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kevin1024/vcrpy/archive/v1.12.0.tar.gz -> vcrpy-1.12.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=243f1ad7ce8a53f489fc2899e855b75b
+_md5_=ebd16e9eb1547d859048a3ebc18af9c4
diff --git a/metadata/md5-cache/dev-python/vcstools-0.1.40 b/metadata/md5-cache/dev-python/vcstools-0.1.40
index 51599e077a37..d87d9ff9d57d 100644
--- a/metadata/md5-cache/dev-python/vcstools-0.1.40
+++ b/metadata/md5-cache/dev-python/vcstools-0.1.40
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/vcstools/vcstools-0.1.40.tar.gz https://github.com/vcstools/vcstools/archive/0.1.40.tar.gz -> vcstools-0.1.40.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68bd8f1f194c5947ea1a2c5e2d91a672
+_md5_=cf7901cdc846066babea5160fc325970
diff --git a/metadata/md5-cache/dev-python/vcstools-0.1.42 b/metadata/md5-cache/dev-python/vcstools-0.1.42
index 0a51455b4b14..770ee9431311 100644
--- a/metadata/md5-cache/dev-python/vcstools-0.1.42
+++ b/metadata/md5-cache/dev-python/vcstools-0.1.42
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/vcstools/vcstools-0.1.42.tar.gz https://github.com/vcstools/vcstools/archive/0.1.42.tar.gz -> vcstools-0.1.42.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68bd8f1f194c5947ea1a2c5e2d91a672
+_md5_=cf7901cdc846066babea5160fc325970
diff --git a/metadata/md5-cache/dev-python/vcstools-9999 b/metadata/md5-cache/dev-python/vcstools-9999
index 09a0f7e06f15..8b4b2cfa630b 100644
--- a/metadata/md5-cache/dev-python/vcstools-9999
+++ b/metadata/md5-cache/dev-python/vcstools-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68bd8f1f194c5947ea1a2c5e2d91a672
+_md5_=cf7901cdc846066babea5160fc325970
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.3 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.3
index d86b2bb9e8e5..95fe5bfd890e 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.3
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/click-5.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-log-0.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/click-log-0.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-threading-0.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.4.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/requests-2.9.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.5.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/atomicwrites-0.1.7[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef73f900340da279181b9efe6996353e
+_md5_=c95561969e42f7c58460671d9334aebc
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.4 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.4
index d334d58401ff..a74c18bcbd43 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.4
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/click-5.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-log-0.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/click-log-0.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-threading-0.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.4.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/requests-2.9.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.5.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/atomicwrites-0.1.7[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef73f900340da279181b9efe6996353e
+_md5_=c95561969e42f7c58460671d9334aebc
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.6 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.6
index 9a68e266753d..35de621517fe 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.6
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/click-5.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-log-0.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/click-log-0.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-threading-0.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.4.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/requests-2.9.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/atomicwrites-0.1.7[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bcd99a131ef00c0523ac597cbde572bc
+_md5_=cb634f816e5c88017324f988abcfedc2
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.7 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.7
index b53f5e1d0655..b28f9b41459c 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.7
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/click-5.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-log-0.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/click-log-0.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-threading-0.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.4.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !=dev-python/requests-2.9.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-toolbelt-0.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/atomicwrites-0.1.7[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bcd99a131ef00c0523ac597cbde572bc
+_md5_=cb634f816e5c88017324f988abcfedc2
diff --git a/metadata/md5-cache/dev-python/venusian-1.0 b/metadata/md5-cache/dev-python/venusian-1.0
index 6d6f65f130e4..63b321c8b7e9 100644
--- a/metadata/md5-cache/dev-python/venusian-1.0
+++ b/metadata/md5-cache/dev-python/venusian-1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=repoze
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/venusian/venusian-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a92542ba468c19f9aceacc9fd002eb27
+_md5_=72d2872d0e25a81a1397ca513d030ce4
diff --git a/metadata/md5-cache/dev-python/venusian-1.0_p20161030 b/metadata/md5-cache/dev-python/venusian-1.0_p20161030
index 208eb152d08f..7241cf16f9a4 100644
--- a/metadata/md5-cache/dev-python/venusian-1.0_p20161030
+++ b/metadata/md5-cache/dev-python/venusian-1.0_p20161030
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=repoze
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pylons/venusian/archive/ec4032596e3aec987ba29b62cac701608ef3b523.zip -> venusian-1.0_p20161030.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d453c4d75324074a7f3e5e5b2e46f8cb
+_md5_=fab61095e024527bfa69887905edbfec
diff --git a/metadata/md5-cache/dev-python/vertex-0.3.1-r1 b/metadata/md5-cache/dev-python/vertex-0.3.1-r1
index 4595ab8d8306..88afe17c4674 100644
--- a/metadata/md5-cache/dev-python/vertex-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/vertex-0.3.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) >=dev-python/epsilon-0.6.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/V/Vertex/Vertex-0.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=932f856e5ea341c11dfcdae5f27c4af9
+_md5_=d324da6e2f3a3f7d31484a9aa896fb6f
diff --git a/metadata/md5-cache/dev-python/vine-1.1.3 b/metadata/md5-cache/dev-python/vine-1.1.3
index c067a38ffb1e..7565e94d15c7 100644
--- a/metadata/md5-cache/dev-python/vine-1.1.3
+++ b/metadata/md5-cache/dev-python/vine-1.1.3
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vine/vine-1.1.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=984788b8686c551703133648b4ba4852
+_md5_=42412715ab2685caaa0d7cde9512af43
diff --git a/metadata/md5-cache/dev-python/vine-1.3.0 b/metadata/md5-cache/dev-python/vine-1.3.0
index bb1e9a71519d..a4c9dd6bc769 100644
--- a/metadata/md5-cache/dev-python/vine-1.3.0
+++ b/metadata/md5-cache/dev-python/vine-1.3.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vine/vine-1.3.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a5394340fa528a16a4268afd00cca647
+_md5_=d06c42ebec482ee31d178ec2e874cba0
diff --git a/metadata/md5-cache/dev-python/virtualenv-15.1.0 b/metadata/md5-cache/dev-python/virtualenv-15.1.0
index a5e092b01496..590b0127df9e 100644
--- a/metadata/md5-cache/dev-python/virtualenv-15.1.0
+++ b/metadata/md5-cache/dev-python/virtualenv-15.1.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/archive/15.1.0.tar.gz -> virtualenv-15.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8627af404400e3b78bcb383ad43eedbe
+_md5_=2b26ddae54d068f1a09614b7bdbf9ab3
diff --git a/metadata/md5-cache/dev-python/virtualenv-16.0.0 b/metadata/md5-cache/dev-python/virtualenv-16.0.0
index 6083d9b04229..eb2696eaede1 100644
--- a/metadata/md5-cache/dev-python/virtualenv-16.0.0
+++ b/metadata/md5-cache/dev-python/virtualenv-16.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/archive/16.0.0.tar.gz -> virtualenv-16.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f42a3da00319aebe4bc14f734538d3a7
+_md5_=d475848a417a0a55b1442aeccf4652ab
diff --git a/metadata/md5-cache/dev-python/visitor-0.1.3 b/metadata/md5-cache/dev-python/visitor-0.1.3
index fabe77580a6a..19878fdd12a5 100644
--- a/metadata/md5-cache/dev-python/visitor-0.1.3
+++ b/metadata/md5-cache/dev-python/visitor-0.1.3
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/visitor/archive/0.1.3.tar.gz -> visitor-0.1.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3b499dd3382d06915c1f08a15b11ec82
+_md5_=2a948ec7a38bccc329fe94c0503b1d0b
diff --git a/metadata/md5-cache/dev-python/waitress-1.0.1 b/metadata/md5-cache/dev-python/waitress-1.0.1
index a18c157df938..f14df43df321 100644
--- a/metadata/md5-cache/dev-python/waitress-1.0.1
+++ b/metadata/md5-cache/dev-python/waitress-1.0.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/waitress/waitress-1.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c49e9b8b6055dfe5f95feb9f09065a4
+_md5_=3c4f636e9cd43b3a00d1592cfd1e16d0
diff --git a/metadata/md5-cache/dev-python/waitress-1.0.2 b/metadata/md5-cache/dev-python/waitress-1.0.2
index b8645649fc68..466cb8d930d2 100644
--- a/metadata/md5-cache/dev-python/waitress-1.0.2
+++ b/metadata/md5-cache/dev-python/waitress-1.0.2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/waitress/waitress-1.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1705fa7bb8f1945768f442f67c5d637f
+_md5_=7067ffd81796ab10a88a2d17bdef95cb
diff --git a/metadata/md5-cache/dev-python/waitress-1.0.2-r1 b/metadata/md5-cache/dev-python/waitress-1.0.2-r1
index 3d616cebee72..d2c7f39c175e 100644
--- a/metadata/md5-cache/dev-python/waitress-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/waitress-1.0.2-r1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/waitress/waitress-1.0.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=84bececed52124a52d44cb0fe0f13e9e
+_md5_=73903971bb6c205b32c761a81fa31c2d
diff --git a/metadata/md5-cache/dev-python/warlock-1.1.0 b/metadata/md5-cache/dev-python/warlock-1.1.0
index 1b30a1a85add..f12872a9688b 100644
--- a/metadata/md5-cache/dev-python/warlock-1.1.0
+++ b/metadata/md5-cache/dev-python/warlock-1.1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonpatch-0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonpatch-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-0.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/warlock/warlock-1.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=799799edf6153c33f7ea0fbd9b42c693
+_md5_=3ee498e92c9d923c84f5d716a6995de2
diff --git a/metadata/md5-cache/dev-python/warlock-1.2.0 b/metadata/md5-cache/dev-python/warlock-1.2.0
index ad3b2a4b70b2..88589d2068cb 100644
--- a/metadata/md5-cache/dev-python/warlock-1.2.0
+++ b/metadata/md5-cache/dev-python/warlock-1.2.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonpatch-0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonpatch-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-0.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/warlock/warlock-1.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=799799edf6153c33f7ea0fbd9b42c693
+_md5_=3ee498e92c9d923c84f5d716a6995de2
diff --git a/metadata/md5-cache/dev-python/warlock-1.3.0 b/metadata/md5-cache/dev-python/warlock-1.3.0
index db91d3ca59e9..d3bfe0e21073 100644
--- a/metadata/md5-cache/dev-python/warlock-1.3.0
+++ b/metadata/md5-cache/dev-python/warlock-1.3.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonpatch-0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/jsonpatch-2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-0.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/warlock/warlock-1.3.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8807d0d599b9730c416d3f160d5fb978
+_md5_=4cd706704023fb93508b9512aec0365d
diff --git a/metadata/md5-cache/dev-python/watchdog-0.8.3-r1 b/metadata/md5-cache/dev-python/watchdog-0.8.3-r1
index 06e70b966d72..0fa3f9530cad 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.8.3-r1
+++ b/metadata/md5-cache/dev-python/watchdog-0.8.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/argh[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pathtools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/watchdog/watchdog-0.8.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9359dbad1f85b41c83127cf06eb9586a
+_md5_=352df82918db547747624bdb1102b41f
diff --git a/metadata/md5-cache/dev-python/watchdog-0.8.3-r2 b/metadata/md5-cache/dev-python/watchdog-0.8.3-r2
index c8946dc8bda5..a3f7ecf3153b 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.8.3-r2
+++ b/metadata/md5-cache/dev-python/watchdog-0.8.3-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/argh[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pathtools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/watchdog/watchdog-0.8.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2070f12f24673cc231df2499e9b26afa
+_md5_=b6a078cc3abf06139f361f21df0a0cda
diff --git a/metadata/md5-cache/dev-python/watchdog-0.9.0 b/metadata/md5-cache/dev-python/watchdog-0.9.0
index f6ab6faa6a82..08a0e37e7737 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.9.0
+++ b/metadata/md5-cache/dev-python/watchdog-0.9.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/argh[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pathtools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v0.9.0.tar.gz -> watchdog-0.9.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fd74a8ec58543d9e9346d448fb72b18b
+_md5_=9a9c6dece4a82b68e0a4c09be6de346c
diff --git a/metadata/md5-cache/dev-python/wcsaxes-0.8 b/metadata/md5-cache/dev-python/wcsaxes-0.8
index 95d36ee02381..c5832b60e27c 100644
--- a/metadata/md5-cache/dev-python/wcsaxes-0.8
+++ b/metadata/md5-cache/dev-python/wcsaxes-0.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcsaxes/wcsaxes-0.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6dc59d4b4738cc29f7f44f03b35b8773
+_md5_=85f08bccb2ff9c19def116c5c07c4195
diff --git a/metadata/md5-cache/dev-python/wcsaxes-0.9 b/metadata/md5-cache/dev-python/wcsaxes-0.9
index 6fb57ff294bf..28deeae18a8c 100644
--- a/metadata/md5-cache/dev-python/wcsaxes-0.9
+++ b/metadata/md5-cache/dev-python/wcsaxes-0.9
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcsaxes/wcsaxes-0.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dffac18a90ba14c8c35434bf750d85ff
+_md5_=e4568a5140d1742db47ac9787832f902
diff --git a/metadata/md5-cache/dev-python/wcsaxes-0.9-r1 b/metadata/md5-cache/dev-python/wcsaxes-0.9-r1
index 99ba776a151d..c9adfb36e1ab 100644
--- a/metadata/md5-cache/dev-python/wcsaxes-0.9-r1
+++ b/metadata/md5-cache/dev-python/wcsaxes-0.9-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcsaxes/wcsaxes-0.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e14841ac48449926acfd8387219ceeb8
+_md5_=7c6070d8dabee29207d0efbfbd8173ff
diff --git a/metadata/md5-cache/dev-python/weasyprint-43 b/metadata/md5-cache/dev-python/weasyprint-43
index d2eab8804e9b..d7be6eab46c5 100644
--- a/metadata/md5-cache/dev-python/weasyprint-43
+++ b/metadata/md5-cache/dev-python/weasyprint-43
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=x11-libs/cairo-1.15.4 x11-libs/gdk-pixbuf[jpeg?,tiff?] x11-libs/pango:0/0 >=dev-python/cairocffi-0.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-0.6:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cssselect2-0.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/html5lib-0.999999999[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyphen-0.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tinycss2-0.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-gfx/cairosvg-1.0.20[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WeasyPrint/WeasyPrint-43.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=54202e9f064982e78549cac69723197a
+_md5_=01f05f2d3db549599cb1e86259b8720e
diff --git a/metadata/md5-cache/dev-python/webassets-0.12 b/metadata/md5-cache/dev-python/webassets-0.12
index 1b33756ec40a..455b5dc36ba7 100644
--- a/metadata/md5-cache/dev-python/webassets-0.12
+++ b/metadata/md5-cache/dev-python/webassets-0.12
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miracle2k/webassets/archive/0.12.tar.gz -> webassets-0.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=988c69747d38e0f33e82f53eacc4d05e
+_md5_=003f925a4bfba23ee923363f2f4c5f99
diff --git a/metadata/md5-cache/dev-python/webassets-0.12.1 b/metadata/md5-cache/dev-python/webassets-0.12.1
index 5e2933eaa962..4aa440c90d72 100644
--- a/metadata/md5-cache/dev-python/webassets-0.12.1
+++ b/metadata/md5-cache/dev-python/webassets-0.12.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miracle2k/webassets/archive/0.12.1.tar.gz -> webassets-0.12.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4abdbfe304ef64df155ea27c92bc7a8
+_md5_=a508993d17e5bdc51b8c8bab4ba45541
diff --git a/metadata/md5-cache/dev-python/webcolors-1.5 b/metadata/md5-cache/dev-python/webcolors-1.5
index 3d8b2aeef8b5..4c00de9dfe94 100644
--- a/metadata/md5-cache/dev-python/webcolors-1.5
+++ b/metadata/md5-cache/dev-python/webcolors-1.5
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/webcolors/webcolors-1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2445c38bde640c68cee0889564e44961
+_md5_=8e62beed61648e48844d070672a1c675
diff --git a/metadata/md5-cache/dev-python/webcolors-1.8.1 b/metadata/md5-cache/dev-python/webcolors-1.8.1
index bffdbb6324e0..103369c9ca17 100644
--- a/metadata/md5-cache/dev-python/webcolors-1.8.1
+++ b/metadata/md5-cache/dev-python/webcolors-1.8.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/webcolors/webcolors-1.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4976169aeed25321091da9c754a8ab2
+_md5_=aea351200a75d11306509227ab1cc14f
diff --git a/metadata/md5-cache/dev-python/weberror-0.13.1 b/metadata/md5-cache/dev-python/weberror-0.13.1
index d137bc949e26..1ced09e268d5 100644
--- a/metadata/md5-cache/dev-python/weberror-0.13.1
+++ b/metadata/md5-cache/dev-python/weberror-0.13.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/paste-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tempita[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/webob[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebError/WebError-0.13.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57836e48b3b4be53eb7efc5a5fe0edfc
+_md5_=99906eb662928eac7aa9a100a616a272
diff --git a/metadata/md5-cache/dev-python/webhelpers-1.3-r1 b/metadata/md5-cache/dev-python/webhelpers-1.3-r1
index 388a9d310127..33c81b0b835a 100644
--- a/metadata/md5-cache/dev-python/webhelpers-1.3-r1
+++ b/metadata/md5-cache/dev-python/webhelpers-1.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/markupsafe-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/webob[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/routes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebHelpers/WebHelpers-1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4194452fdf4a008c0748c7346bcc7ebb
+_md5_=a9deca32aecfb24d7bd8eb057c5662b4
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.48.0 b/metadata/md5-cache/dev-python/websocket-client-0.48.0
index 7f04c70e8a53..e275b6a30f0f 100644
--- a/metadata/md5-cache/dev-python/websocket-client-0.48.0
+++ b/metadata/md5-cache/dev-python/websocket-client-0.48.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86 ~x64-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/backports-ssl-match-hostname[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/websocket-client/websocket_client-0.48.0.tar.gz -> websocket-client-0.48.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=177a043849fbcca604a9d42d34a0b5ad
+_md5_=6614b5897306a27d7447d17fc100d14d
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.21 b/metadata/md5-cache/dev-python/webtest-2.0.21
index 1ce09d6c1681..0c8748099394 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.21
+++ b/metadata/md5-cache/dev-python/webtest-2.0.21
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/waitress-0.8.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.21.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77ca34949776b70e422d610a8a306e19
+_md5_=e0c3dd35ad4a4854e6510485605b6e56
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.29 b/metadata/md5-cache/dev-python/webtest-2.0.29
index a46dd0b989e9..d78cb55ec5eb 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.29
+++ b/metadata/md5-cache/dev-python/webtest-2.0.29
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/waitress-0.8.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.29.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c42e357b2efc6600f27192ab0be458ee
+_md5_=daa355cd69398a8c80266cafb26b3e7f
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.29-r1 b/metadata/md5-cache/dev-python/webtest-2.0.29-r1
index 7650e00b8f8d..6ef83ba64094 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.29-r1
+++ b/metadata/md5-cache/dev-python/webtest-2.0.29-r1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/waitress-0.8.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.29.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=be035f07179567c5d69fa0daf75eae0d
+_md5_=c1581d52f89fa709532b3549dc5057b7
diff --git a/metadata/md5-cache/dev-python/wehjit-0.2.2-r1 b/metadata/md5-cache/dev-python/wehjit-0.2.2-r1
index 429c53dba361..5e7c32f23f4b 100644
--- a/metadata/md5-cache/dev-python/wehjit-0.2.2-r1
+++ b/metadata/md5-cache/dev-python/wehjit-0.2.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/genshi dev-python/assets[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://jderose.fedorapeople.org/wehjit/0.2.2/wehjit-0.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50a54a988572f9b2b86b212be007b2ce
+_md5_=ae6a9fd0cac3a4128239797b35fea0b7
diff --git a/metadata/md5-cache/dev-python/whichcraft-0.4.1 b/metadata/md5-cache/dev-python/whichcraft-0.4.1
index e6c33b239421..5af48a5deb20 100644
--- a/metadata/md5-cache/dev-python/whichcraft-0.4.1
+++ b/metadata/md5-cache/dev-python/whichcraft-0.4.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pydanny/whichcraft/archive/0.4.1.tar.gz -> whichcraft-0.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=499e3004bea6302c16f0d8dd7c10f833
+_md5_=729a2e7ae207eeee8eab5a6ab34ffbba
diff --git a/metadata/md5-cache/dev-python/whisper-1.1.3 b/metadata/md5-cache/dev-python/whisper-1.1.3
index 7ffdb36ef8f9..3978ec428631 100644
--- a/metadata/md5-cache/dev-python/whisper-1.1.3
+++ b/metadata/md5-cache/dev-python/whisper-1.1.3
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/graphite-project/whisper/archive/1.1.3.tar.gz -> whisper-1.1.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=24e917a1b703fc86509d3fe470124586
+_md5_=37f7577125da65b89f347ae82755bf71
diff --git a/metadata/md5-cache/dev-python/whisper-1.1.5 b/metadata/md5-cache/dev-python/whisper-1.1.5
index 344351938375..6b8ab0de1ab2 100644
--- a/metadata/md5-cache/dev-python/whisper-1.1.5
+++ b/metadata/md5-cache/dev-python/whisper-1.1.5
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/graphite-project/whisper/archive/1.1.5.tar.gz -> whisper-1.1.5.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=24376e49abd84ed1c852ac37fb8b21db
+_md5_=850445a098798a6169dd1d925ffdc5b9
diff --git a/metadata/md5-cache/dev-python/whoosh-2.6.0 b/metadata/md5-cache/dev-python/whoosh-2.6.0
index ae8bc91d092d..c917abbf32eb 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.6.0
+++ b/metadata/md5-cache/dev-python/whoosh-2.6.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/Whoosh/Whoosh-2.6.0.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=45b409535a741fe5c18028d20c97a09b
+_md5_=b3d53c72ebd334f9aa1cd9fee86a5386
diff --git a/metadata/md5-cache/dev-python/whoosh-2.7.4 b/metadata/md5-cache/dev-python/whoosh-2.7.4
index bab342288a24..993993f8f128 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.7.4
+++ b/metadata/md5-cache/dev-python/whoosh-2.7.4
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-sol
 LICENSE=BSD-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/Whoosh/Whoosh-2.7.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa14cdd500eb31835e7f4c65271770e3
+_md5_=1b38409c204cba280680d6fe861c8590
diff --git a/metadata/md5-cache/dev-python/wrapt-1.10.10 b/metadata/md5-cache/dev-python/wrapt-1.10.10
index 1d89241d80cd..4ffeab2a273a 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.10.10
+++ b/metadata/md5-cache/dev-python/wrapt-1.10.10
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.10.10.tar.gz -> wrapt-1.10.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1153046801e500da921f84eaee99c070
+_md5_=9f5cf91a2687622c866bd5506708e8b0
diff --git a/metadata/md5-cache/dev-python/wrapt-1.10.11 b/metadata/md5-cache/dev-python/wrapt-1.10.11
index 8972688ae66c..11365982412d 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.10.11
+++ b/metadata/md5-cache/dev-python/wrapt-1.10.11
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.10.11.tar.gz -> wrapt-1.10.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=304b21f08239fee40caa76b1b24cad24
+_md5_=41b5581103521c0ddbbe4b0f03e8d2c4
diff --git a/metadata/md5-cache/dev-python/wrapt-1.11.2 b/metadata/md5-cache/dev-python/wrapt-1.11.2
index 41f675ac7f0b..9caaff83fc7d 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.11.2
+++ b/metadata/md5-cache/dev-python/wrapt-1.11.2
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.11.2.tar.gz -> wrapt-1.11.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e5ebc3c70064d02cf411ccbee36410bb
+_md5_=0ddc4cf78c92c8d9f5a3995d42b624d7
diff --git a/metadata/md5-cache/dev-python/ws4py-0.3.4 b/metadata/md5-cache/dev-python/ws4py-0.3.4
index d62de16f8452..5df7da97958f 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.3.4
+++ b/metadata/md5-cache/dev-python/ws4py-0.3.4
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=BSD
 RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cython-0.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] client? ( >=www-servers/tornado-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) server? ( >=dev-python/cherrypy-3.2.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads?] ) python_targets_python3_5? ( dev-lang/python:3.5[threads?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/archive/v0.3.4 -> ws4py-0.3.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39008324c2c9e640befba87dc1bb44f1
+_md5_=aaf7af172eb87e6ca632e26e30422776
diff --git a/metadata/md5-cache/dev-python/ws4py-0.3.4-r1 b/metadata/md5-cache/dev-python/ws4py-0.3.4-r1
index 6d9a827cb68e..96379170ac32 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.3.4-r1
+++ b/metadata/md5-cache/dev-python/ws4py-0.3.4-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=BSD
 RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cython-0.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] client? ( >=www-servers/tornado-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) server? ( <dev-python/cherrypy-9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads?] ) python_targets_python3_5? ( dev-lang/python:3.5[threads?] ) python_targets_python3_6? ( dev-lang/python:3.6[threads?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/archive/v0.3.4 -> ws4py-0.3.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c28233b519182220b1134106bb7a3329
+_md5_=85dfd4927caf5fe47dc5c0302f3926ff
diff --git a/metadata/md5-cache/dev-python/ws4py-0.5.1 b/metadata/md5-cache/dev-python/ws4py-0.5.1
index 766ecd0502b1..2e514c63270d 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.5.1
+++ b/metadata/md5-cache/dev-python/ws4py-0.5.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=BSD
 RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cython-0.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] client? ( >=www-servers/tornado-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) server? ( >=dev-python/cherrypy-3.2.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads?] ) python_targets_python3_5? ( dev-lang/python:3.5[threads?] ) python_targets_python3_6? ( dev-lang/python:3.6[threads?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/archive/0.5.1.tar.gz -> ws4py-0.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aaf7c801dba411b5d454b3d89e863336
+_md5_=d91423094765e9c12d254589f142d806
diff --git a/metadata/md5-cache/dev-python/ws4py-9999 b/metadata/md5-cache/dev-python/ws4py-9999
index e80029d3b522..aa853dc5939e 100644
--- a/metadata/md5-cache/dev-python/ws4py-9999
+++ b/metadata/md5-cache/dev-python/ws4py-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cython-0.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] client? ( >=www-servers/tornado-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) server? ( >=dev-python/cherrypy-3.2.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads?] ) python_targets_python3_5? ( dev-lang/python:3.5[threads?] ) python_targets_python3_6? ( dev-lang/python:3.6[threads?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6dc9c1754aa34c2e79c913b1830ab828
+_md5_=04a6664c396be76b5d7b9202736e609e
diff --git a/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108 b/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
index 9d737ff6d29e..fa64199d4496 100644
--- a/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
+++ b/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/methane/wsaccel/archive/0fbd074c257c51b73de05b25ccb6488801320a32.zip -> wsaccel-0.6.2_p20170108.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=819fa7cc0d0a5e388be41364fdc1e4ea
+_md5_=5b11496b11074f1cbec222656d22d66f
diff --git a/metadata/md5-cache/dev-python/wsgiintercept-1.3.1 b/metadata/md5-cache/dev-python/wsgiintercept-1.3.1
index bfa1199f9aea..db6b61d942fc 100644
--- a/metadata/md5-cache/dev-python/wsgiintercept-1.3.1
+++ b/metadata/md5-cache/dev-python/wsgiintercept-1.3.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsgi_intercept/wsgi_intercept-1.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9fc90eb9aa1ddf26bd300a99499b6e0
+_md5_=ab937932a0344704b91ef72e050b2184
diff --git a/metadata/md5-cache/dev-python/wsproto-0.11.0 b/metadata/md5-cache/dev-python/wsproto-0.11.0
index b1fe211cfe47..46894492099c 100644
--- a/metadata/md5-cache/dev-python/wsproto-0.11.0
+++ b/metadata/md5-cache/dev-python/wsproto-0.11.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND==dev-python/h11-0.7*[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-0.11.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=afd00710f6b8b1dddae0f819a7580606
+_md5_=a2c4df5312e2a974e87ccdc04f085e59
diff --git a/metadata/md5-cache/dev-python/wsproto-0.12.0 b/metadata/md5-cache/dev-python/wsproto-0.12.0
index b8323ace9a55..a1ede7930953 100644
--- a/metadata/md5-cache/dev-python/wsproto-0.12.0
+++ b/metadata/md5-cache/dev-python/wsproto-0.12.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND==dev-python/h11-0.8*[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-0.12.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3713d3a3b86b24e79d72438d2089900d
+_md5_=b3a79dc48a9d9aa3cce4ff03872e2894
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.5-r1 b/metadata/md5-cache/dev-python/wstools-0.4.5-r1
index 4614f87c7529..a87e4e42ebae 100644
--- a/metadata/md5-cache/dev-python/wstools-0.4.5-r1
+++ b/metadata/md5-cache/dev-python/wstools-0.4.5-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wstools/wstools-0.4.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=464dc4300d213b7fe19adea426469b0c
+_md5_=ef49491eb55fc3b0af1832c590cf9fbf
diff --git a/metadata/md5-cache/dev-python/wtf-peewee-0.2.6 b/metadata/md5-cache/dev-python/wtf-peewee-0.2.6
index 67b72f2311ee..f0776fefdd8f 100644
--- a/metadata/md5-cache/dev-python/wtf-peewee-0.2.6
+++ b/metadata/md5-cache/dev-python/wtf-peewee-0.2.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/peewee-2.7.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/wtforms[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/coleifer/wtf-peewee/archive/0.2.6.tar.gz -> wtf-peewee-0.2.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9438cbc61927b6dce0989bdabed505b
+_md5_=e60c30e1edc82a3c94669f1d1ae9ade4
diff --git a/metadata/md5-cache/dev-python/wtf-peewee-3.0.0 b/metadata/md5-cache/dev-python/wtf-peewee-3.0.0
index 9b2631583af5..c0d826e57900 100644
--- a/metadata/md5-cache/dev-python/wtf-peewee-3.0.0
+++ b/metadata/md5-cache/dev-python/wtf-peewee-3.0.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/peewee-3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wtforms[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/coleifer/wtf-peewee/archive/3.0.0.tar.gz -> wtf-peewee-3.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8567e4a4b03da0f55bba19f77fb14a4b
+_md5_=0fe5070f67fb6577dbfde83c9f18db4c
diff --git a/metadata/md5-cache/dev-python/wtforms-2.1 b/metadata/md5-cache/dev-python/wtforms-2.1
index e033328e7be9..f2a45aa928d1 100644
--- a/metadata/md5-cache/dev-python/wtforms-2.1
+++ b/metadata/md5-cache/dev-python/wtforms-2.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=app-arch/unzip dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-0.6[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WTForms/WTForms-2.1.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0197aeafbd210b7e96dcabd34ffa692
+_md5_=9486fc274d14160c4c8684b3d84f5737
diff --git a/metadata/md5-cache/dev-python/wtforms-2.2.1 b/metadata/md5-cache/dev-python/wtforms-2.2.1
index e2cda2a205c1..470da403a554 100644
--- a/metadata/md5-cache/dev-python/wtforms-2.2.1
+++ b/metadata/md5-cache/dev-python/wtforms-2.2.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WTForms/WTForms-2.2.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3dc9bd58140cc2bdbc208f9d21e1242c
+_md5_=8e8cda5437d0cb32d2d5ab917a6727b0
diff --git a/metadata/md5-cache/dev-python/www-authenticate-0.9.2 b/metadata/md5-cache/dev-python/www-authenticate-0.9.2
index dd8e496ded4e..ec50084f154a 100644
--- a/metadata/md5-cache/dev-python/www-authenticate-0.9.2
+++ b/metadata/md5-cache/dev-python/www-authenticate-0.9.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alexsdutton/www-authenticate/archive/0.9.2.tar.gz -> www-authenticate-0.9.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d0198e75174fde0e35744f08f06df31
+_md5_=2ea1b6a4484ec089c6005dcec7a59c0d
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.6 b/metadata/md5-cache/dev-python/wxpython-4.0.6
index 2df5d969b962..608bd9584fff 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.0.6
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.6
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=wxWinLL-3
 RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=4.0
 SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bba57463587500e017698bae6aafb381
+_md5_=85674287df864c4f27ac6f8acbca5537
diff --git a/metadata/md5-cache/dev-python/xarray-0.10.8 b/metadata/md5-cache/dev-python/xarray-0.10.8
index a6bc15c974fd..512a14f2db17 100644
--- a/metadata/md5-cache/dev-python/xarray-0.10.8
+++ b/metadata/md5-cache/dev-python/xarray-0.10.8
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/numpy-1.14[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-0.10.8.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=65ca5fbc8026e6a1284520e7bcef9124
+_md5_=03538ff85a459b3ea05ed35f22593b22
diff --git a/metadata/md5-cache/dev-python/xarray-0.12.1 b/metadata/md5-cache/dev-python/xarray-0.12.1
index 0de3ccabee10..427ceee77536 100644
--- a/metadata/md5-cache/dev-python/xarray-0.12.1
+++ b/metadata/md5-cache/dev-python/xarray-0.12.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/numpy-1.14[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pandas-0.19.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-0.12.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4c9a74cfeeac5a01da2adf1c708a914f
+_md5_=6f7f603d3cae5a415b75db2ca89e6eae
diff --git a/metadata/md5-cache/dev-python/xcffib-0.5.1 b/metadata/md5-cache/dev-python/xcffib-0.5.1
index faa8673d4f88..a6ac4788169e 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.5.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.5.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/libxcb python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b34cb9f9207de506c3946fa09f40279
+_md5_=208ac257437561a0b944052c2161e818
diff --git a/metadata/md5-cache/dev-python/xcffib-0.6.0 b/metadata/md5-cache/dev-python/xcffib-0.6.0
index 09cd5317379d..535dada66cb8 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.6.0
+++ b/metadata/md5-cache/dev-python/xcffib-0.6.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/libxcb python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e2bf2e80121952b3cc4d5fec068d31c
+_md5_=b45020980a105ae8fadc5d0d42465d17
diff --git a/metadata/md5-cache/dev-python/xcffib-0.7.0 b/metadata/md5-cache/dev-python/xcffib-0.7.0
index 97926dbf0405..783d74ed53e1 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.7.0
+++ b/metadata/md5-cache/dev-python/xcffib-0.7.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/libxcb python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.7.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d5fe155fa95f57c6b5b710375ec9f984
+_md5_=e21f340edfa7a0c59c2a3c31535b75a9
diff --git a/metadata/md5-cache/dev-python/xcffib-0.8.1 b/metadata/md5-cache/dev-python/xcffib-0.8.1
index e62df49b4569..c64b07062cf8 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.8.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.8.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/libxcb python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.8.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=928d2dae9d335a199560bddd7b9c53eb
+_md5_=83867859b59d5d21430bf0b1b5c5e470
diff --git a/metadata/md5-cache/dev-python/xdis-3.3.1 b/metadata/md5-cache/dev-python/xdis-3.3.1
index c9f940ebe980..3fae08575c64 100644
--- a/metadata/md5-cache/dev-python/xdis-3.3.1
+++ b/metadata/md5-cache/dev-python/xdis-3.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xdis/xdis-3.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd3d24b7a6d0d0bc41f168a877ec71e1
+_md5_=3c6ac59bdbfe3f5aad9a355432796483
diff --git a/metadata/md5-cache/dev-python/xdis-3.6.0 b/metadata/md5-cache/dev-python/xdis-3.6.0
index 032de76a0b16..7674afd82090 100644
--- a/metadata/md5-cache/dev-python/xdis-3.6.0
+++ b/metadata/md5-cache/dev-python/xdis-3.6.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rocky/python-xdis/archive/release-3.6.0.tar.gz -> xdis-3.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8297203f5ccc621f378dc41c79a70ab
+_md5_=4d5086bfd3b3d85ba7e6b7531b2f97bf
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-0.9.8 b/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
index 7ae7b10ad71f..caba3d627f7d 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
+++ b/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/X/XlsxWriter/XlsxWriter-0.9.8.tar.gz test? ( https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_0.9.8.zip -> xlsxwriter-0.9.8-tests.zip )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d7afb11ddec9620b0b0d4b0c0d1b12f
+_md5_=170ec0479b3bba4839df8de7be80c0bf
diff --git a/metadata/md5-cache/dev-python/xlutils-1.7.1 b/metadata/md5-cache/dev-python/xlutils-1.7.1
index ce9549d3a5c0..92a889ef7711 100644
--- a/metadata/md5-cache/dev-python/xlutils-1.7.1
+++ b/metadata/md5-cache/dev-python/xlutils-1.7.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/xlwt-0.7.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/xlrd-0.7.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlutils/xlutils-1.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08fd7fd54104c64427b5631d89a42f09
+_md5_=5663cf18ca2d06fee4605570d5a4b843
diff --git a/metadata/md5-cache/dev-python/xlutils-2.0.0-r1 b/metadata/md5-cache/dev-python/xlutils-2.0.0-r1
index 8f7a18cea3a3..6a0400611301 100644
--- a/metadata/md5-cache/dev-python/xlutils-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/xlutils-2.0.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/xlwt-1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/xlrd-1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlutils/xlutils-2.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=10d6ce67c7ff11e66fa2995939b67edc
+_md5_=4f98591d4daa876160e2ada7e99d32ad
diff --git a/metadata/md5-cache/dev-python/xlwt-1.2.0 b/metadata/md5-cache/dev-python/xlwt-1.2.0
index a045c2f5d679..f141ce4d82a3 100644
--- a/metadata/md5-cache/dev-python/xlwt-1.2.0
+++ b/metadata/md5-cache/dev-python/xlwt-1.2.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlwt/xlwt-1.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b67efa518bb060ab71a6bc0082d23861
+_md5_=7deaed76e38003287eb68ca7cc386069
diff --git a/metadata/md5-cache/dev-python/xlwt-1.3.0 b/metadata/md5-cache/dev-python/xlwt-1.3.0
index 767e9cc93d4e..3922dcea0236 100644
--- a/metadata/md5-cache/dev-python/xlwt-1.3.0
+++ b/metadata/md5-cache/dev-python/xlwt-1.3.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlwt/xlwt-1.3.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c08ab6b1596a042e9cb60af8cf25771f
+_md5_=ff980c3c984de36597266bb7740a201f
diff --git a/metadata/md5-cache/dev-python/xmltodict-0.11.0 b/metadata/md5-cache/dev-python/xmltodict-0.11.0
index 3848d80ec01d..962139396b78 100644
--- a/metadata/md5-cache/dev-python/xmltodict-0.11.0
+++ b/metadata/md5-cache/dev-python/xmltodict-0.11.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmltodict/xmltodict-0.11.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b37da8637b4bc4a139c32d9c83c2ca47
+_md5_=64ca0b833360c78463540eda1647c039
diff --git a/metadata/md5-cache/dev-python/xmltodict-0.12.0 b/metadata/md5-cache/dev-python/xmltodict-0.12.0
index 0f66e99b2eb2..2bcf587b35d2 100644
--- a/metadata/md5-cache/dev-python/xmltodict-0.12.0
+++ b/metadata/md5-cache/dev-python/xmltodict-0.12.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmltodict/xmltodict-0.12.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=81cd7ed39558b1d46ef4360fc65761f9
+_md5_=c51d889ac8200843fd7b1b74fb04f237
diff --git a/metadata/md5-cache/dev-python/xstatic-1.0.1 b/metadata/md5-cache/dev-python/xstatic-1.0.1
index 4cb519f275da..1299da46c88f 100644
--- a/metadata/md5-cache/dev-python/xstatic-1.0.1
+++ b/metadata/md5-cache/dev-python/xstatic-1.0.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic/XStatic-1.0.1.tar.gz -> xstatic-1.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=033c32df518ce9c55dd2931cb2553cb3
+_md5_=04e98e54aea25d86332672e29cf693bf
diff --git a/metadata/md5-cache/dev-python/xstatic-bootstrap-scss-3.3.7.1 b/metadata/md5-cache/dev-python/xstatic-bootstrap-scss-3.3.7.1
index cd2eaee6a74a..291a45f22308 100644
--- a/metadata/md5-cache/dev-python/xstatic-bootstrap-scss-3.3.7.1
+++ b/metadata/md5-cache/dev-python/xstatic-bootstrap-scss-3.3.7.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS-3.3.7.1.tar.gz -> xstatic-bootstrap-scss-3.3.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0794b8adf68fb454ed223c864312e30b
+_md5_=4823eef1f2ef4a7183e382fc569d08f0
diff --git a/metadata/md5-cache/dev-python/xstatic-datatables-1.10.15.1 b/metadata/md5-cache/dev-python/xstatic-datatables-1.10.15.1
index c99c4feb536d..9243f228b52e 100644
--- a/metadata/md5-cache/dev-python/xstatic-datatables-1.10.15.1
+++ b/metadata/md5-cache/dev-python/xstatic-datatables-1.10.15.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic-DataTables/XStatic-DataTables-1.10.15.1.tar.gz -> xstatic-datatables-1.10.15.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a84d024c34e6ce4d7b81dc16094c1d8a
+_md5_=1449679e3a2347699238435b90fcf73e
diff --git a/metadata/md5-cache/dev-python/xstatic-jquery-1.10.2.1 b/metadata/md5-cache/dev-python/xstatic-jquery-1.10.2.1
index ac57ef5003e3..f7b1f9ce471e 100644
--- a/metadata/md5-cache/dev-python/xstatic-jquery-1.10.2.1
+++ b/metadata/md5-cache/dev-python/xstatic-jquery-1.10.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic-jQuery/XStatic-jQuery-1.10.2.1.tar.gz -> xstatic-jquery-1.10.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87ada9d3045ae27b85c8d66416fc1846
+_md5_=bc1e76f9b87ff772fafc8401c6fae36e
diff --git a/metadata/md5-cache/dev-python/xstatic-patternfly-3.21.0.1 b/metadata/md5-cache/dev-python/xstatic-patternfly-3.21.0.1
index bdf43d5cfc2f..a3a154f897f4 100644
--- a/metadata/md5-cache/dev-python/xstatic-patternfly-3.21.0.1
+++ b/metadata/md5-cache/dev-python/xstatic-patternfly-3.21.0.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic-Patternfly/XStatic-Patternfly-3.21.0.1.tar.gz -> xstatic-patternfly-3.21.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eef9103530cbe7a21445d81115a6f6e6
+_md5_=b30bacf39ca9db326730af5f65df42db
diff --git a/metadata/md5-cache/dev-python/xstatic-patternfly-bootstrap-treeview-2.1.3.2 b/metadata/md5-cache/dev-python/xstatic-patternfly-bootstrap-treeview-2.1.3.2
index 178382cecc82..b99594556656 100644
--- a/metadata/md5-cache/dev-python/xstatic-patternfly-bootstrap-treeview-2.1.3.2
+++ b/metadata/md5-cache/dev-python/xstatic-patternfly-bootstrap-treeview-2.1.3.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic-Patternfly-Bootstrap-Treeview/XStatic-Patternfly-Bootstrap-Treeview-2.1.3.2.tar.gz -> xstatic-patternfly-bootstrap-treeview-2.1.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb05f5506d35abc5312dd9daea5af363
+_md5_=2fd77e0b58e1fb60dec32bd6fa791679
diff --git a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.8 b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.8
index 2d2e2f0cf7c1..738a0df8a218 100644
--- a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.8
+++ b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.8
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xvfb] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xvfbwrapper/xvfbwrapper-0.2.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a5d7c03950c7a93df3b8e9bd0a22be5
+_md5_=9861485262eb7ac247b31133afa27761
diff --git a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9 b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
index f8e06b03b3e1..c484f7fd6e4d 100644
--- a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
+++ b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xvfb] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xvfbwrapper/xvfbwrapper-0.2.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6323a4a48a2a2f9ca333c852aa09d6a5
+_md5_=43eb9edfc715d8441bdac2b11eca58d2
diff --git a/metadata/md5-cache/dev-python/yapf-0.24.0 b/metadata/md5-cache/dev-python/yapf-0.24.0
index ef7ce109b3dc..430c40a25c3f 100644
--- a/metadata/md5-cache/dev-python/yapf-0.24.0
+++ b/metadata/md5-cache/dev-python/yapf-0.24.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/yapf/archive/v0.24.0.tar.gz -> yapf-0.24.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f34e40155a10797487c4c1cfcbdf9fc7
+_md5_=9cf9a9fd5a0d389f7867a5d0d400f2e8
diff --git a/metadata/md5-cache/dev-python/yapf-0.28.0 b/metadata/md5-cache/dev-python/yapf-0.28.0
index 768a013f200d..1fb99584ea95 100644
--- a/metadata/md5-cache/dev-python/yapf-0.28.0
+++ b/metadata/md5-cache/dev-python/yapf-0.28.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/yapf/archive/v0.28.0.tar.gz -> yapf-0.28.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e9dbeaef8d1150e86a021245ba82509f
+_md5_=9f2d906a6e3cb2e9782204b941e242f9
diff --git a/metadata/md5-cache/dev-python/yappi-0.98 b/metadata/md5-cache/dev-python/yappi-0.98
index e15c272763a3..db2a6c58421d 100644
--- a/metadata/md5-cache/dev-python/yappi-0.98
+++ b/metadata/md5-cache/dev-python/yappi-0.98
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yappi/yappi-0.98.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4bec457a2f0122ac1a0a840417d06af6
+_md5_=034d35b08ab8b699c366c45cabeee02f
diff --git a/metadata/md5-cache/dev-python/yappi-1.0 b/metadata/md5-cache/dev-python/yappi-1.0
index bbd59958f0a0..29cc76e4952f 100644
--- a/metadata/md5-cache/dev-python/yappi-1.0
+++ b/metadata/md5-cache/dev-python/yappi-1.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yappi/yappi-1.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1443ca3752973842d593649e0f1a92c5
+_md5_=da9da805a24d132022f02592709becfe
diff --git a/metadata/md5-cache/dev-python/yarl-1.1.1 b/metadata/md5-cache/dev-python/yarl-1.1.1
index d5c29931124e..917cf747dae4 100644
--- a/metadata/md5-cache/dev-python/yarl-1.1.1
+++ b/metadata/md5-cache/dev-python/yarl-1.1.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/multidict-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=085d74df47ff1affe763040f2ea8b2d8
+_md5_=8046a355d64f94b37d449df1bb162205
diff --git a/metadata/md5-cache/dev-python/yarl-1.3.0 b/metadata/md5-cache/dev-python/yarl-1.3.0
index 6b9b65beea98..82b082ed7902 100644
--- a/metadata/md5-cache/dev-python/yarl-1.3.0
+++ b/metadata/md5-cache/dev-python/yarl-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/multidict-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34cb1cde516062cf693dde7c2c1c159f
+_md5_=4e2028e4bc7a3a0cdcead73db2063dd5
diff --git a/metadata/md5-cache/dev-python/zake-0.2.1 b/metadata/md5-cache/dev-python/zake-0.2.1
index 3fac83b9dea2..865e5edb8565 100644
--- a/metadata/md5-cache/dev-python/zake-0.2.1
+++ b/metadata/md5-cache/dev-python/zake-0.2.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/kazoo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zake/zake-0.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46272767930e0cb464f466965c7cdfd1
+_md5_=e8825f8e07031ce856b66f00d6ad9b43
diff --git a/metadata/md5-cache/dev-python/zc-buildout-2.5.3-r1 b/metadata/md5-cache/dev-python/zc-buildout-2.5.3-r1
index dfddcfde01aa..c7117f5da7ed 100644
--- a/metadata/md5-cache/dev-python/zc-buildout-2.5.3-r1
+++ b/metadata/md5-cache/dev-python/zc-buildout-2.5.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ZPL
 RDEPEND=>=dev-python/setuptools-3.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zc.buildout/zc.buildout-2.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b933a43e24cc223714eb7f6d34c3e048
+_md5_=99961b39f62662cc06d532cb97b29a30
diff --git a/metadata/md5-cache/dev-python/zc-lockfile-1.4 b/metadata/md5-cache/dev-python/zc-lockfile-1.4
index d7d9c506d505..1881cb980b2a 100644
--- a/metadata/md5-cache/dev-python/zc-lockfile-1.4
+++ b/metadata/md5-cache/dev-python/zc-lockfile-1.4
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=ZPL
 RDEPEND=>=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zc.lockfile/zc.lockfile-1.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9a994cb34e70ab3c76dc46c8bb31915c
+_md5_=c7b074fce47480141d5e509e34e8ad09
diff --git a/metadata/md5-cache/dev-python/zict-0.1.2 b/metadata/md5-cache/dev-python/zict-0.1.2
index b4d35c9b8ddd..6f4a2d822d2e 100644
--- a/metadata/md5-cache/dev-python/zict-0.1.2
+++ b/metadata/md5-cache/dev-python/zict-0.1.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/HeapDict[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zict/zict-0.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a20c77b575f2d0c41bb7cb59be456e4
+_md5_=22c7a80c680c2b02ef30690afd79ed67
diff --git a/metadata/md5-cache/dev-python/zict-0.1.3 b/metadata/md5-cache/dev-python/zict-0.1.3
index 1db59e7fc949..eda8a0a291db 100644
--- a/metadata/md5-cache/dev-python/zict-0.1.3
+++ b/metadata/md5-cache/dev-python/zict-0.1.3
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/HeapDict[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zict/zict-0.1.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4ce301ffa5c15cc7684647f6ec7daef5
+_md5_=af08901bfe0c09be02227400b5ba265a
diff --git a/metadata/md5-cache/dev-python/zict-0.1.4 b/metadata/md5-cache/dev-python/zict-0.1.4
index dc6f6f658bab..137d543f3cdc 100644
--- a/metadata/md5-cache/dev-python/zict-0.1.4
+++ b/metadata/md5-cache/dev-python/zict-0.1.4
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/HeapDict[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zict/zict-0.1.4.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=338cbbfd3fe6cc493a92cbac8cabc28d
+_md5_=bb9153e636ab740e0fad9be24da857d6
diff --git a/metadata/md5-cache/dev-python/zipp-0.5.2 b/metadata/md5-cache/dev-python/zipp-0.5.2
index 3724ab95c63c..d56320789e4e 100644
--- a/metadata/md5-cache/dev-python/zipp-0.5.2
+++ b/metadata/md5-cache/dev-python/zipp-0.5.2
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zipp/zipp-0.5.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=22ad3a00cbefd1760a29c6f68c7643fc
+_md5_=423e9752b000c6b86e0ecae2246e4752
diff --git a/metadata/md5-cache/dev-python/zipp-0.6.0 b/metadata/md5-cache/dev-python/zipp-0.6.0
index 065edf870fb9..39ac590962b6 100644
--- a/metadata/md5-cache/dev-python/zipp-0.6.0
+++ b/metadata/md5-cache/dev-python/zipp-0.6.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=MIT
 RDEPEND=dev-python/more-itertools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zipp/zipp-0.6.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d9c1d05c618c700a369fc71e53e20676
+_md5_=7242864f6ed5973697993bdeb6fa8ffa
diff --git a/metadata/md5-cache/dev-python/zope-deprecation-4.2.0 b/metadata/md5-cache/dev-python/zope-deprecation-4.2.0
index ce628f458ca6..75fbf0197a74 100644
--- a/metadata/md5-cache/dev-python/zope-deprecation-4.2.0
+++ b/metadata/md5-cache/dev-python/zope-deprecation-4.2.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=ZPL
 RDEPEND=dev-python/namespace-zope[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.deprecation/zope.deprecation-4.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba6af6f4d00960c564d34bd1b45cb5d1
+_md5_=53b9ccf08ee74b0b51d6c6304ff437f1
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.10.1 b/metadata/md5-cache/dev-qt/qt-creator-4.10.1
index 3fada071e3e1..94454524bc93 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-4.10.1
+++ b/metadata/md5-cache/dev-qt/qt-creator-4.10.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 clang? ( sys-devel/clang:8= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] bazaar? ( dev-vcs/bzr ) cmake? ( dev-util/cmake ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_da? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_de? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.12.3:5 )
 REQUIRED_USE=clang? ( test? ( qbs ) ) qnx? ( remotelinux )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qtcreator/4.10/4.10.1/qt-creator-opensource-src-4.10.1.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a90e8383fa96f30d5b757634fe9e0381
+_md5_=20f3bf86258960c93df58a47875ef2dc
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.8.2 b/metadata/md5-cache/dev-qt/qt-creator-4.8.2
index 424dc0e1d0f9..89db61e55db6 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-4.8.2
+++ b/metadata/md5-cache/dev-qt/qt-creator-4.8.2
@@ -7,7 +7,8 @@ IUSE=doc systemd test +webengine android autotools baremetal bazaar +clang clear
 KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND==dev-libs/botan-2.9*:2=[-bindist] >=dev-qt/qtconcurrent-5.9.0:5 >=dev-qt/qtcore-5.9.0:5 >=dev-qt/qtdeclarative-5.9.0:5[widgets] >=dev-qt/qtgui-5.9.0:5 >=dev-qt/qtnetwork-5.9.0:5[ssl] >=dev-qt/qtprintsupport-5.9.0:5 >=dev-qt/qtquickcontrols-5.9.0:5 >=dev-qt/qtscript-5.9.0:5 >=dev-qt/qtsql-5.9.0:5[sqlite] >=dev-qt/qtsvg-5.9.0:5 >=dev-qt/qtwidgets-5.9.0:5 >=dev-qt/qtx11extras-5.9.0:5 >=dev-qt/qtxml-5.9.0:5 clang? ( >=sys-devel/clang-6:= ) designer? ( >=dev-qt/designer-5.9.0:5 ) help? ( >=dev-qt/qthelp-5.9.0:5 webengine? ( >=dev-qt/qtwebengine-5.9.0:5[widgets] ) ) qbs? ( ~dev-util/qbs-1.12.2 ) serialterminal? ( >=dev-qt/qtserialport-5.9.0:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) cmake? ( dev-util/cmake[server(+)] ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_da? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_de? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.9.0:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.9.0:5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qtcreator/4.8/4.8.2/qt-creator-opensource-src-4.8.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=830627722dcfa9f676def959765b2a44
+_md5_=029b4070e9787eef993bc054ee77bbdf
diff --git a/metadata/md5-cache/dev-qt/qt-creator-9999 b/metadata/md5-cache/dev-qt/qt-creator-9999
index 0e0c1399fd80..81c9dee71125 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-9999
+++ b/metadata/md5-cache/dev-qt/qt-creator-9999
@@ -9,6 +9,7 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 clang? ( sys-devel/clang:8= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] bazaar? ( dev-vcs/bzr ) cmake? ( dev-util/cmake ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_da? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_de? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.12.3:5 )
 REQUIRED_USE=boot2qt? ( remotelinux ) clang? ( test? ( qbs ) ) mcu? ( cmake ) python? ( lsp ) qnx? ( remotelinux )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	git-r3	6d22636df236df4cc8475f7b7668bdcd	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29196e865fe9b2e5e37aa94501f81f60
+_md5_=8150838694bc14d568e8ebbbd3db61cb
diff --git a/metadata/md5-cache/dev-qt/qtchooser-66 b/metadata/md5-cache/dev-qt/qtchooser-66
index 72b3d4d1166d..827a7477eef1 100644
--- a/metadata/md5-cache/dev-qt/qtchooser-66
+++ b/metadata/md5-cache/dev-qt/qtchooser-66
@@ -6,7 +6,8 @@ HOMEPAGE=https://code.qt.io/cgit/qtsdk/qtchooser.git/
 IUSE=test
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=|| ( LGPL-2.1 GPL-3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.qt.io/official_releases/qtchooser/qtchooser-66.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6f5a4adab558e0776f24e44fd65037fc
+_md5_=f8907c2b2f1f8d32ec240cac62962d94
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
index 6f564d2fdafd..869a9f943dbb 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd
 LICENSE=GPL-2
 RDEPEND=~net-analyzer/rrdtool-1.6.0[graph=] ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	5ad91e467b477000267afdeea4a7093e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=69a40cf5308a323692e1ce948e05e22f
+_md5_=ea70190b6941fd8e76ae6de7a81ec144
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.1-r1 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.1-r1
index 2594908beeba..5dec94838c65 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86
 LICENSE=GPL-2
 RDEPEND=~net-analyzer/rrdtool-1.7.1[graph=] ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-ng	5ad91e467b477000267afdeea4a7093e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a5c5a3faa844d683cb38f026fa095e01
+_md5_=34169e7349d232b9654d8bdef83bd9da
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
index 845281e1d2aa..1f8952d4bbb1 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86
 LICENSE=GPL-2
 RDEPEND=~net-analyzer/rrdtool-1.7.2[graph=] ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-ng	5ad91e467b477000267afdeea4a7093e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a5c5a3faa844d683cb38f026fa095e01
+_md5_=34169e7349d232b9654d8bdef83bd9da
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.7.10 b/metadata/md5-cache/dev-ruby/rubygems-2.7.10
index 23c6056a1e0b..7707f14bd14a 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.7.10
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.7.10
@@ -9,7 +9,8 @@ LICENSE=GPL-2 || ( Ruby MIT )
 PDEPEND=server? ( >=dev-ruby/builder-2.1 )
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.7.10.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	ruby-ng	5ad91e467b477000267afdeea4a7093e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=44232bddf5c60e5cdeb7aa27f9da3ab4
+_md5_=ee3ccec39a8c105c2dc249a7d243d982
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.0.3 b/metadata/md5-cache/dev-ruby/rubygems-3.0.3
index bdd76f78547a..bfcc8b8ba7bb 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.0.3
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.0.3
@@ -9,7 +9,8 @@ LICENSE=GPL-2 || ( Ruby MIT )
 PDEPEND=server? ( =dev-ruby/builder-3* )
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.0.3.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	ruby-ng	5ad91e467b477000267afdeea4a7093e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b91d8ad19332d665d1aa335fd0d4576d
+_md5_=621184d564997c6ac4ed524456ca30fe
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.0.4-r1 b/metadata/md5-cache/dev-ruby/rubygems-3.0.4-r1
index 12d2ee9ec472..6a72f55864ac 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.0.4-r1
@@ -9,7 +9,8 @@ LICENSE=GPL-2 || ( Ruby MIT )
 PDEPEND=server? ( =dev-ruby/builder-3* )
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.0.4.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	ruby-ng	5ad91e467b477000267afdeea4a7093e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c01e5f43560b9ed18feac292482b30f8
+_md5_=db9daecccdddbd275f8bd2a20e02ea3d
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.0.6 b/metadata/md5-cache/dev-ruby/rubygems-3.0.6
index 3e402d7de143..f34b2ed5a946 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.0.6
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.0.6
@@ -10,7 +10,8 @@ LICENSE=GPL-2 || ( Ruby MIT )
 PDEPEND=server? ( =dev-ruby/builder-3* )
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.0.6.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	ruby-ng	5ad91e467b477000267afdeea4a7093e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=87a16eb026ae018cf48cf1ac18452f61
+_md5_=0cab365559ef03ad63755e3a432dcc44
diff --git a/metadata/md5-cache/dev-scheme/gauche-0.9.6-r1 b/metadata/md5-cache/dev-scheme/gauche-0.9.6-r1
index 9a2583e16a48..e2d70d19c614 100644
--- a/metadata/md5-cache/dev-scheme/gauche-0.9.6-r1
+++ b/metadata/md5-cache/dev-scheme/gauche-0.9.6-r1
@@ -7,7 +7,8 @@ IUSE=ipv6 libressl mbedtls test
 KEYWORDS=~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=sys-libs/gdbm mbedtls? ( net-libs/mbedtls:= )
+RESTRICT=!test? ( test )
 SLOT=0/0.9
 SRC_URI=mirror://sourceforge/gauche/Gauche-0.9.6.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a526f77286a0bd13aa5257e9d9d84872
+_md5_=50f09fc49e4ebf28dad1158ed637da01
diff --git a/metadata/md5-cache/dev-scheme/gauche-0.9.8 b/metadata/md5-cache/dev-scheme/gauche-0.9.8
index c455d1abae5b..1d2e7be78672 100644
--- a/metadata/md5-cache/dev-scheme/gauche-0.9.8
+++ b/metadata/md5-cache/dev-scheme/gauche-0.9.8
@@ -7,7 +7,8 @@ IUSE=ipv6 libressl mbedtls test
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=sys-libs/gdbm mbedtls? ( net-libs/mbedtls:= )
+RESTRICT=!test? ( test )
 SLOT=0/0.97
 SRC_URI=mirror://sourceforge/gauche/Gauche-0.9.8.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fd6465894878e593f51546e871ae910a
+_md5_=6ea241be83a11149a8ee4cddaea70839
diff --git a/metadata/md5-cache/dev-tex/biber-2.12 b/metadata/md5-cache/dev-tex/biber-2.12
index 42ee4f1a7a52..bf848cdb2cb4 100644
--- a/metadata/md5-cache/dev-tex/biber-2.12
+++ b/metadata/md5-cache/dev-tex/biber-2.12
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Artistic-2
 RDEPEND=>=dev-lang/perl-5.26 dev-perl/autovivification dev-perl/Business-ISBN dev-perl/Business-ISMN dev-perl/Business-ISSN dev-perl/Class-Accessor dev-perl/Data-Compare dev-perl/Data-Dump dev-perl/Data-Uniqid dev-perl/DateTime-Calendar-Julian dev-perl/DateTime-Format-Builder dev-perl/Encode-EUCJPASCII dev-perl/Encode-HanExtra dev-perl/Encode-JIS2K dev-perl/File-Slurper dev-perl/IPC-Run3 dev-perl/libwww-perl[ssl] >=dev-perl/Lingua-Translit-0.280 dev-perl/List-AllUtils dev-perl/List-MoreUtils dev-perl/List-MoreUtils-XS dev-perl/Log-Log4perl dev-perl/LWP-Protocol-https dev-perl/PerlIO-utf8_strict dev-perl/Regexp-Common dev-perl/Sort-Key >=dev-perl/Text-BibTeX-0.850.0 dev-perl/Text-CSV dev-perl/Text-CSV_XS dev-perl/Text-Roman dev-perl/URI >=dev-perl/Unicode-LineBreak-2016.3.0 >=virtual/perl-Unicode-Normalize-1.250.0 >=dev-perl/XML-LibXML-1.70 dev-perl/XML-LibXML-Simple dev-perl/XML-LibXSLT dev-perl/XML-Writer ~dev-tex/biblatex-3.12 virtual/perl-IPC-Cmd >=virtual/perl-Unicode-Collate-1.250.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/plk/biber/archive/v2.12.tar.gz -> biber-2.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=25310fa16dff35af42f209c1e1cb2f8b
+_md5_=854dbdc83735d89edf596d072246044b
diff --git a/metadata/md5-cache/dev-tex/biber-2.7 b/metadata/md5-cache/dev-tex/biber-2.7
index 7a5bc8977d9c..4afc440b48e8 100644
--- a/metadata/md5-cache/dev-tex/biber-2.7
+++ b/metadata/md5-cache/dev-tex/biber-2.7
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~x86
 LICENSE=Artistic-2
 RDEPEND=>=dev-lang/perl-5.24 dev-perl/autovivification dev-perl/Business-ISBN dev-perl/Business-ISMN dev-perl/Business-ISSN dev-perl/Class-Accessor dev-perl/Data-Compare dev-perl/Data-Dump dev-perl/Data-Uniqid dev-perl/DateTime-Calendar-Julian dev-perl/DateTime-Format-Builder dev-perl/Encode-EUCJPASCII dev-perl/Encode-HanExtra dev-perl/Encode-JIS2K dev-perl/File-Slurp dev-perl/IPC-Run3 dev-perl/libwww-perl[ssl] >=dev-perl/Lingua-Translit-0.250 dev-perl/List-AllUtils dev-perl/List-MoreUtils dev-perl/List-MoreUtils-XS dev-perl/Log-Log4perl dev-perl/LWP-Protocol-https dev-perl/Regexp-Common dev-perl/Sort-Key >=dev-perl/Text-BibTeX-0.760.0 dev-perl/Text-CSV dev-perl/Text-CSV_XS dev-perl/Text-Roman dev-perl/URI >=dev-perl/Unicode-LineBreak-2016.3.0 >=virtual/perl-Unicode-Normalize-1.250.0 >=dev-perl/XML-LibXML-1.70 dev-perl/XML-LibXML-Simple dev-perl/XML-LibXSLT dev-perl/XML-Writer ~dev-tex/biblatex-3.7 virtual/perl-IPC-Cmd >=virtual/perl-Unicode-Collate-1.190.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/plk/biber/archive/v2.7.tar.gz -> biber-2.7.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9ca0fb2217fe2f4323d8f90393703e86
+_md5_=1a45f1d7631b48ecf482e32ccb97d872
diff --git a/metadata/md5-cache/dev-tex/chktex-1.7.1 b/metadata/md5-cache/dev-tex/chktex-1.7.1
index b87b1d2f0b5c..7866ec557efc 100644
--- a/metadata/md5-cache/dev-tex/chktex-1.7.1
+++ b/metadata/md5-cache/dev-tex/chktex-1.7.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-lang/perl pcre? ( dev-libs/libpcre )
 REQUIRED_USE=test? ( pcre )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/chktex/chktex-1.7.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b7b1d7b9f226e37dab27bbffbdca3696
+_md5_=826a7600dc91899296d8e18bdcb0c197
diff --git a/metadata/md5-cache/dev-tex/chktex-1.7.6 b/metadata/md5-cache/dev-tex/chktex-1.7.6
index 584cd8bfff18..28e98c384402 100644
--- a/metadata/md5-cache/dev-tex/chktex-1.7.6
+++ b/metadata/md5-cache/dev-tex/chktex-1.7.6
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-lang/perl pcre? ( dev-libs/libpcre )
 REQUIRED_USE=test? ( pcre )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/chktex/chktex-1.7.6.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f85e16b69cb0d92133c9a6ed5e1bed7
+_md5_=aad895831f0134c36f2815199f55549e
diff --git a/metadata/md5-cache/dev-tex/latex2rtf-2.3.11 b/metadata/md5-cache/dev-tex/latex2rtf-2.3.11
index e20674d522e0..602d41f90dcd 100644
--- a/metadata/md5-cache/dev-tex/latex2rtf-2.3.11
+++ b/metadata/md5-cache/dev-tex/latex2rtf-2.3.11
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base media-gfx/imagemagick
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/latex2rtf/latex2rtf-2.3.11a.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cffe838b949f17df33f63393b2e90cdc
+_md5_=cf9860e4df48da1fae9401c8c8b6802d
diff --git a/metadata/md5-cache/dev-tex/latex2rtf-2.3.15 b/metadata/md5-cache/dev-tex/latex2rtf-2.3.15
index 222441888b00..21ff6a4910c6 100644
--- a/metadata/md5-cache/dev-tex/latex2rtf-2.3.15
+++ b/metadata/md5-cache/dev-tex/latex2rtf-2.3.15
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base media-gfx/imagemagick
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/latex2rtf/latex2rtf-2.3.15.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=530cd612e530422935ed9abf386fc381
+_md5_=a3eaf844dd4bf3c75208a49b9055a53d
diff --git a/metadata/md5-cache/dev-tex/latexdiff-1.2.1 b/metadata/md5-cache/dev-tex/latexdiff-1.2.1
index 294c7e2f633f..5b3a978511ba 100644
--- a/metadata/md5-cache/dev-tex/latexdiff-1.2.1
+++ b/metadata/md5-cache/dev-tex/latexdiff-1.2.1
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/perl-5.8 virtual/latex-base dev-texlive/texlive-plaingeneric dev-perl/Algorithm-Diff
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ftilmann/latexdiff/archive/1.2.1.tar.gz -> latexdiff-1.2.1.tar.gz
-_md5_=555dbbc83dfaa857bfc90271493a0705
+_md5_=101ac2e7ab806f1483897206678b7df4
diff --git a/metadata/md5-cache/dev-tex/latexdiff-1.3.0 b/metadata/md5-cache/dev-tex/latexdiff-1.3.0
index 663f666aee8c..70707145a76c 100644
--- a/metadata/md5-cache/dev-tex/latexdiff-1.3.0
+++ b/metadata/md5-cache/dev-tex/latexdiff-1.3.0
@@ -8,6 +8,7 @@ IUSE=test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/perl-5.8 virtual/latex-base dev-texlive/texlive-plaingeneric dev-perl/Algorithm-Diff
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ftilmann/latexdiff/archive/1.3.0.tar.gz -> latexdiff-1.3.0.tar.gz
-_md5_=3da58def7b1027ad19a4fc0ca08f8fb6
+_md5_=63b8f89fe6f8a6a8f0380b7953ef1ac6
diff --git a/metadata/md5-cache/dev-tex/latexdiff-9999 b/metadata/md5-cache/dev-tex/latexdiff-9999
index 233b3f45284d..b6cb809d1efd 100644
--- a/metadata/md5-cache/dev-tex/latexdiff-9999
+++ b/metadata/md5-cache/dev-tex/latexdiff-9999
@@ -8,6 +8,7 @@ IUSE=test
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=dev-lang/perl-5.8 virtual/latex-base dev-texlive/texlive-plaingeneric dev-perl/Algorithm-Diff
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd
-_md5_=a74596b6e61726c8c2210e100d6284eb
+_md5_=00d6bf10b6432887e71db58bd4489dc4
diff --git a/metadata/md5-cache/dev-tex/style-check-0.14 b/metadata/md5-cache/dev-tex/style-check-0.14
index 5931db32b9f9..94fa718db6c2 100644
--- a/metadata/md5-cache/dev-tex/style-check-0.14
+++ b/metadata/md5-cache/dev-tex/style-check-0.14
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/ruby
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.cs.umd.edu/~nspring/software/style-check-0.14.tar.gz
-_md5_=b9808817f827c61b92f503a6df5ef133
+_md5_=76072058cd2baf60a7974c1677b5ab5f
diff --git a/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1 b/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
index bc890b5a9ec9..1e2d5ef72256 100644
--- a/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
+++ b/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=dev-lang/perl dev-perl/YAML-Syck dev-perl/IO-All dev-vcs/subversion dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INFINOID/App-SVN-Bisect-1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=556e485c6136172f61e6ff9aac11077a
+_md5_=c18357180c9cccaf6c95bcfb51f6b847
diff --git a/metadata/md5-cache/dev-util/anjuta-3.28.0-r1 b/metadata/md5-cache/dev-util/anjuta-3.28.0-r1
index 613b937deb29..175d56cb8ae7 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.28.0-r1
+++ b/metadata/md5-cache/dev-util/anjuta-3.28.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.34:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.10:3 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) devhelp? ( >=dev-util/devhelp-3.7.4:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) subversion? ( >=dev-vcs/subversion-1.8:= >=net-libs/serf-1.2:1= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) terminal? ( >=x11-libs/vte-0.27.6:2.91 ) vala? ( || ( dev-lang/vala:0.40 ) ) gnome-base/gsettings-desktop-schemas packagekit? ( app-admin/packagekit-base )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.28/anjuta-3.28.0.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3cb5ca4a8528f4c50ea1c9a2ec31c61
+_md5_=c79a8cfdcfc9f11986a48af031b457c9
diff --git a/metadata/md5-cache/dev-util/autodia-2.140.0-r2 b/metadata/md5-cache/dev-util/autodia-2.140.0-r2
index 7254155e6f2a..91006f0c79b8 100644
--- a/metadata/md5-cache/dev-util/autodia-2.140.0-r2
+++ b/metadata/md5-cache/dev-util/autodia-2.140.0-r2
@@ -8,7 +8,8 @@ IUSE=graphviz test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Template-Toolkit dev-perl/XML-Simple graphviz? ( dev-perl/GraphViz ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TE/TEEJAY/Autodia-2.14.tar.gz mirror://gentoo/Autodia-2.14-dbi.patch.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=09ef95e18dbabf2c2606573f4947db6c
+_md5_=5fceaa12a4d4af0fd4af31455bf5b5ca
diff --git a/metadata/md5-cache/dev-util/babeltrace-1.2.3 b/metadata/md5-cache/dev-util/babeltrace-1.2.3
index c284fc5e1405..8181547fd98b 100644
--- a/metadata/md5-cache/dev-util/babeltrace-1.2.3
+++ b/metadata/md5-cache/dev-util/babeltrace-1.2.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/popt sys-apps/util-linux
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://lttng.org/files/babeltrace/babeltrace-1.2.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=40f014a3e8fcd75aa506c7ff3c8c14f0
+_md5_=7bc0c5afc2883192d5ccbc51d3a341c7
diff --git a/metadata/md5-cache/dev-util/babeltrace-1.2.4 b/metadata/md5-cache/dev-util/babeltrace-1.2.4
index b0cf507d967b..c8d72896fa5c 100644
--- a/metadata/md5-cache/dev-util/babeltrace-1.2.4
+++ b/metadata/md5-cache/dev-util/babeltrace-1.2.4
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/popt sys-apps/util-linux
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://lttng.org/files/babeltrace/babeltrace-1.2.4.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee6dc696750d4bf2a7db14b07f203adb
+_md5_=fde8a8912cd1a048293bb6fb0e275ef3
diff --git a/metadata/md5-cache/dev-util/bam-0.4.0-r1 b/metadata/md5-cache/dev-util/bam-0.4.0-r1
index 370663cbf24d..c54f589cfb30 100644
--- a/metadata/md5-cache/dev-util/bam-0.4.0-r1
+++ b/metadata/md5-cache/dev-util/bam-0.4.0-r1
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=amd64 x86
 LICENSE=ZLIB
 RDEPEND=dev-lang/lua:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/downloads/matricks/bam/bam-0.4.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b96f480bf604336fdbee3473bec0dab
+_md5_=1571881d5711fc4d09fdacbb08043796
diff --git a/metadata/md5-cache/dev-util/bam-0.5.1 b/metadata/md5-cache/dev-util/bam-0.5.1
index 2aad7f9f5469..97dde6fd6cef 100644
--- a/metadata/md5-cache/dev-util/bam-0.5.1
+++ b/metadata/md5-cache/dev-util/bam-0.5.1
@@ -8,7 +8,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 RDEPEND=>=dev-lang/lua-5.3:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matricks/bam/archive/v0.5.1.tar.gz -> bam-0.5.1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c145a47d4f9ec2dddddb89b5feb3d1c0
+_md5_=6662f9392a03e1f12cad3c6854fe2313
diff --git a/metadata/md5-cache/dev-util/bite-9999 b/metadata/md5-cache/dev-util/bite-9999
index 46d8a3eb1341..4727bc4452e8 100644
--- a/metadata/md5-cache/dev-util/bite-9999
+++ b/metadata/md5-cache/dev-util/bite-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=dev-python/requests-2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/multidict[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-crypt/gpgme[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca03aff52cb691753cc18c291ebfb77e
+_md5_=37ba9ea2a2a8863fed5dfc2533db8fa4
diff --git a/metadata/md5-cache/dev-util/buildbot-0.8.12-r3 b/metadata/md5-cache/dev-util/buildbot-0.8.12-r3
index a4b8860f5705..c9be91f4dac7 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.8.12-r3
+++ b/metadata/md5-cache/dev-util/buildbot-0.8.12-r3
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-lin
 LICENSE=GPL-2
 RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.7.10-r999[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] irc? ( dev-python/twisted-words[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mail? ( dev-python/twisted-mail[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) manhole? ( dev-python/twisted-conch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.8.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c60f2cc8f34700ef1c6777d2dba4fb6
+_md5_=2968121cc07e2787da1daa33e179a5de
diff --git a/metadata/md5-cache/dev-util/buildbot-0.9.12-r1 b/metadata/md5-cache/dev-util/buildbot-0.9.12-r1
index 6efff4edfe0e..915dbdb7f1c1 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.9.12-r1
+++ b/metadata/md5-cache/dev-util/buildbot-0.9.12-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=836de42c545b1fe9e1eaa16f365b88c1
+_md5_=4932c1f6022847f6e2910faf50ae1ad4
diff --git a/metadata/md5-cache/dev-util/buildbot-1.1.2 b/metadata/md5-cache/dev-util/buildbot-1.1.2
index fe2984d60381..ad90314e880f 100644
--- a/metadata/md5-cache/dev-util/buildbot-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-1.1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-1.1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-1.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90c5734be06992f073dd0d89bd50fcd2
+_md5_=41fdaa147146b45c1fc7a9da1f84e6e0
diff --git a/metadata/md5-cache/dev-util/buildbot-1.3.0 b/metadata/md5-cache/dev-util/buildbot-1.3.0
index 2a71683f400a..d3a26cb8f29e 100644
--- a/metadata/md5-cache/dev-util/buildbot-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99e5d7067198277a333f152fd185115c
+_md5_=9e6af414498eba3a437b27c020fcc000
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index d74e9893e649..08d7a77b9ac3 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -8,6 +8,7 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-worker-9999[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99e5d7067198277a333f152fd185115c
+_md5_=9e6af414498eba3a437b27c020fcc000
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12 b/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12
index d1c8f40e983d..ec7a648cb84a 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-0.9.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa9b41b14091b4ebe91c53066e52cb02
+_md5_=65fe55d4cb2edeb7b66845f4009c2bb9
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-1.1.2 b/metadata/md5-cache/dev-util/buildbot-console-view-1.1.2
index 1c04d263cf92..adcd3d05d93a 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-1.1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=~dev-util/buildbot-1.1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-1.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a428281646436c4d2878c6c92fad960
+_md5_=65fe55d4cb2edeb7b66845f4009c2bb9
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-1.3.0 b/metadata/md5-cache/dev-util/buildbot-console-view-1.3.0
index 8054db44075e..8e357982a870 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=~dev-util/buildbot-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a428281646436c4d2878c6c92fad960
+_md5_=65fe55d4cb2edeb7b66845f4009c2bb9
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1 b/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
index a7c0bf5f9c9f..f95e46486b1d 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-0.9.12.post1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80c7ac142b740bdbe08112440380f196
+_md5_=320685cba8768606cb8064c07c3e024d
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2 b/metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2
index a0d55156f4fc..9b82a5b964eb 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-1.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=788e38878475d4139a355bfbd39e30b1
+_md5_=27e2d05201dca3a9554791f2e3535dc5
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-1.3.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-1.3.0
index 08587a74967a..b17b8c1b2c5c 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=788e38878475d4139a355bfbd39e30b1
+_md5_=27e2d05201dca3a9554791f2e3535dc5
diff --git a/metadata/md5-cache/dev-util/buildbot-slave-0.8.12 b/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
index 1685f3c14653..5b627e9a61c9 100644
--- a/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
+++ b/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-lin
 LICENSE=GPL-2
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-slave/buildbot-slave-0.8.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63e712e16dbc7581de6e14af315faee6
+_md5_=092d573b942756c848e99a0914cd76bf
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12
index 0ee1535f4977..faa7cd2b9ef1 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82a412514081677fb95faa75067b3840
+_md5_=26f70cc5131b17b7ad789533d32dcac5
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.2 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.2
index 65d806083eb2..d2aa677281d6 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=~dev-util/buildbot-1.1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8ea5ec73b58bb8cb02649dd648ece61
+_md5_=26f70cc5131b17b7ad789533d32dcac5
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0
index ca17d3d4ab08..fc2aac463be5 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=~dev-util/buildbot-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-util/buildbot-www-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8ea5ec73b58bb8cb02649dd648ece61
+_md5_=26f70cc5131b17b7ad789533d32dcac5
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-0.9.12 b/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
index f5ff49175c68..24c4d74274b1 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-util/buildbot-0.9.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b535303e25ace8053e5941a08dfe9c6a
+_md5_=9bd3a8933630f7d3ab65064ceaf76b89
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-1.1.2 b/metadata/md5-cache/dev-util/buildbot-worker-1.1.2
index 77a3122a63dd..ae568a8106ff 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-worker-1.1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-util/buildbot-0.9.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-1.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a0d649ef86c2c4c3cf1891d0e9d86c8
+_md5_=d8d61402b9d59914b0db126b396efe08
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-1.3.0 b/metadata/md5-cache/dev-util/buildbot-worker-1.3.0
index d7553e55d119..17d6428874ea 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-worker-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-util/buildbot-0.9.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a0d649ef86c2c4c3cf1891d0e9d86c8
+_md5_=d8d61402b9d59914b0db126b396efe08
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index 1d39e19b596c..3e94ab6e592b 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -8,6 +8,7 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-util/buildbot-0.9.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a0d649ef86c2c4c3cf1891d0e9d86c8
+_md5_=d8d61402b9d59914b0db126b396efe08
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
index 9d6c99c5ba0c..074a21f9e5ff 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a5143bedc7656d6314189a79e2001f3
+_md5_=b129262749c11f020387c8bf3f879511
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.1.2 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.1.2
index 84a7fdfb00a6..922508ab5ed0 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c7b5f66c214d579ccd1747b0fcd66be1
+_md5_=a952c2ede800f6dd3eab9a734086c884
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.3.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.3.0
index 3600f232d1d1..9cefffbcb604 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c7b5f66c214d579ccd1747b0fcd66be1
+_md5_=a952c2ede800f6dd3eab9a734086c884
diff --git a/metadata/md5-cache/dev-util/buildbot-www-0.9.12 b/metadata/md5-cache/dev-util/buildbot-www-0.9.12
index 0afe40b93e69..273f8b755b88 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-www-0.9.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-0.9.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e4292c1b29287755123a88823a18d6e
+_md5_=325529182bc3ec20f5617aef931144a9
diff --git a/metadata/md5-cache/dev-util/buildbot-www-1.1.2 b/metadata/md5-cache/dev-util/buildbot-www-1.1.2
index 6db429a2ea41..035968ee48d4 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-www-1.1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-1.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87142262d3b4dc1c5dffb9ff22a6499e
+_md5_=325529182bc3ec20f5617aef931144a9
diff --git a/metadata/md5-cache/dev-util/buildbot-www-1.3.0 b/metadata/md5-cache/dev-util/buildbot-www-1.3.0
index d35aa59dd20e..58515999da9c 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-www-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87142262d3b4dc1c5dffb9ff22a6499e
+_md5_=325529182bc3ec20f5617aef931144a9
diff --git a/metadata/md5-cache/dev-util/catkin-0.7.14 b/metadata/md5-cache/dev-util/catkin-0.7.14
index 240e18838377..768f8e602d13 100644
--- a/metadata/md5-cache/dev-util/catkin-0.7.14
+++ b/metadata/md5-cache/dev-util/catkin-0.7.14
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/catkin/archive/0.7.14.tar.gz -> catkin-0.7.14.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c7a346646f11204353661ca9c9a4607
+_md5_=243221de76438573be0b41dcd0e93dbd
diff --git a/metadata/md5-cache/dev-util/catkin-0.7.17 b/metadata/md5-cache/dev-util/catkin-0.7.17
index 4ecbf7c5e775..c8e618a250f6 100644
--- a/metadata/md5-cache/dev-util/catkin-0.7.17
+++ b/metadata/md5-cache/dev-util/catkin-0.7.17
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/catkin/archive/0.7.17.tar.gz -> catkin-0.7.17.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07f27bedd5c733f36da0534ead6cb329
+_md5_=b076bfbfc8493d9561a1b5a1abd30481
diff --git a/metadata/md5-cache/dev-util/catkin-9999 b/metadata/md5-cache/dev-util/catkin-9999
index 3603957798ff..6cb8547b36d1 100644
--- a/metadata/md5-cache/dev-util/catkin-9999
+++ b/metadata/md5-cache/dev-util/catkin-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/empy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07f27bedd5c733f36da0534ead6cb329
+_md5_=b076bfbfc8493d9561a1b5a1abd30481
diff --git a/metadata/md5-cache/dev-util/cgdb-0.6.8 b/metadata/md5-cache/dev-util/cgdb-0.6.8
index eebaed85ad3d..8a488fb5eed7 100644
--- a/metadata/md5-cache/dev-util/cgdb-0.6.8
+++ b/metadata/md5-cache/dev-util/cgdb-0.6.8
@@ -7,7 +7,8 @@ IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= sys-devel/gdb
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cgdb/cgdb/archive/v0.6.8.tar.gz -> cgdb-0.6.8.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2aebd69a7815866ced7d4d083aa850fe
+_md5_=cd01827af0c1e5cfa1b208684e777639
diff --git a/metadata/md5-cache/dev-util/cgdb-0.7.0-r1 b/metadata/md5-cache/dev-util/cgdb-0.7.0-r1
index 14f6eb36ec28..fc67e0f82778 100644
--- a/metadata/md5-cache/dev-util/cgdb-0.7.0-r1
+++ b/metadata/md5-cache/dev-util/cgdb-0.7.0-r1
@@ -8,7 +8,8 @@ IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= sys-devel/gdb
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cgdb/cgdb/archive/v0.7.0.tar.gz -> cgdb-0.7.0.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=54d6c58235fe4faa05a428487770ab54
+_md5_=119c034fce18ac0cbaec429a70df4b68
diff --git a/metadata/md5-cache/dev-util/cgdb-9999 b/metadata/md5-cache/dev-util/cgdb-9999
index f42c3065c37b..990dc0f250bd 100644
--- a/metadata/md5-cache/dev-util/cgdb-9999
+++ b/metadata/md5-cache/dev-util/cgdb-9999
@@ -8,6 +8,7 @@ IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= sys-devel/gdb
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=54d6c58235fe4faa05a428487770ab54
+_md5_=119c034fce18ac0cbaec429a70df4b68
diff --git a/metadata/md5-cache/dev-util/cmake-3.14.6 b/metadata/md5-cache/dev-util/cmake-3.14.6
index 0c67b7b8fe39..796b9c4c8750 100644
--- a/metadata/md5-cache/dev-util/cmake-3.14.6
+++ b/metadata/md5-cache/dev-util/cmake-3.14.6
@@ -8,7 +8,8 @@ IUSE=doc emacs system-jsoncpp ncurses qt5 test test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.14/cmake-3.14.6.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0118c094bf267ba2850e2f8032da2291
+_md5_=cf4760e0061b7930637a666ad2817988
diff --git a/metadata/md5-cache/dev-util/cmake-3.14.7 b/metadata/md5-cache/dev-util/cmake-3.14.7
index 345c87bff578..ee12660dacbe 100644
--- a/metadata/md5-cache/dev-util/cmake-3.14.7
+++ b/metadata/md5-cache/dev-util/cmake-3.14.7
@@ -8,7 +8,8 @@ IUSE=doc emacs system-jsoncpp ncurses qt5 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.14/cmake-3.14.7.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7459941476829a07093e8036e203235d
+_md5_=30e26fa56bc792e24d61acab0d2c4dee
diff --git a/metadata/md5-cache/dev-util/cmake-3.15.4 b/metadata/md5-cache/dev-util/cmake-3.15.4
index 248156fc4f67..afe43677baa2 100644
--- a/metadata/md5-cache/dev-util/cmake-3.15.4
+++ b/metadata/md5-cache/dev-util/cmake-3.15.4
@@ -8,7 +8,8 @@ IUSE=doc emacs system-jsoncpp ncurses qt5 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.15/cmake-3.15.4.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11d8f3ef1fac6bcfa192c9c09710358b
+_md5_=e664e5e6bcfacf72849373f3eb400b77
diff --git a/metadata/md5-cache/dev-util/cmake-3.15.5 b/metadata/md5-cache/dev-util/cmake-3.15.5
index 9ac503f070a4..dde2c90b8cce 100644
--- a/metadata/md5-cache/dev-util/cmake-3.15.5
+++ b/metadata/md5-cache/dev-util/cmake-3.15.5
@@ -8,7 +8,8 @@ IUSE=doc emacs system-jsoncpp ncurses qt5 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.15/cmake-3.15.5.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11d8f3ef1fac6bcfa192c9c09710358b
+_md5_=e664e5e6bcfacf72849373f3eb400b77
diff --git a/metadata/md5-cache/dev-util/cmocka-1.1.5 b/metadata/md5-cache/dev-util/cmocka-1.1.5
index b7704c2b1b77..03a6c1099d59 100644
--- a/metadata/md5-cache/dev-util/cmocka-1.1.5
+++ b/metadata/md5-cache/dev-util/cmocka-1.1.5
@@ -6,7 +6,8 @@ HOMEPAGE=https://cmocka.org/
 IUSE=doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmocka.org/files/1.1/cmocka-1.1.5.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32fed162351364ee7c23f0db2a3d5018
+_md5_=78d39a2c72fc565bdcf0727ef7fe22ee
diff --git a/metadata/md5-cache/dev-util/cookiecutter-1.6.0 b/metadata/md5-cache/dev-util/cookiecutter-1.6.0
index 5901229323d7..c9ad7e81a4c9 100644
--- a/metadata/md5-cache/dev-util/cookiecutter-1.6.0
+++ b/metadata/md5-cache/dev-util/cookiecutter-1.6.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=>=dev-python/future-0.15.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/binaryornot-0.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whichcraft-0.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/poyo-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja2-time-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/audreyr/cookiecutter/archive/1.6.0.tar.gz -> cookiecutter-1.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54e576b4c29f7576d31499230e0ef764
+_md5_=ab1275bae6cbf867cd092295bb54b80a
diff --git a/metadata/md5-cache/dev-util/d-feet-0.3.14 b/metadata/md5-cache/dev-util/d-feet-0.3.14
index 0f218a5cbabe..e849e9a39ce1 100644
--- a/metadata/md5-cache/dev-util/d-feet-0.3.14
+++ b/metadata/md5-cache/dev-util/d-feet-0.3.14
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/glib-2.34:2 >=dev-python/pygobject-3.3.91:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sys-apps/dbus-1 X? ( x11-libs/libwnck:3[introspection] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/d-feet/0.3/d-feet-0.3.14.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6f3587767cb82b8c40adcd6b16105ac
+_md5_=7adb99cf1e738bb076dbe93df7463715
diff --git a/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0 b/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0
index d6871eea9ccd..2df06f3598b1 100644
--- a/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0
+++ b/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/dbus-glib dev-libs/glib:2 dev-python/dbusmock[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/dbus-test-runner/19.04/19.04.0/+download/dbus-test-runner-19.04.0.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8939d55c84eca9abf1e55a1e74e4fe46
+_md5_=f47ed6d7a1ddc086b79ea3695ceed5ff
diff --git a/metadata/md5-cache/dev-util/debhelper-12.7.1 b/metadata/md5-cache/dev-util/debhelper-12.7.1
index 6da275eb8450..963434dc1513 100644
--- a/metadata/md5-cache/dev-util/debhelper-12.7.1
+++ b/metadata/md5-cache/dev-util/debhelper-12.7.1
@@ -7,7 +7,8 @@ IUSE=test l10n_de l10n_es l10n_fr
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_12.7.1.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e0b59ccfc43fe797b946ca341a13367c
+_md5_=0c3734818c2d1c6cf1af678aeb656147
diff --git a/metadata/md5-cache/dev-util/debhelper-12.7.2 b/metadata/md5-cache/dev-util/debhelper-12.7.2
index d617cadcfabf..ed0ef24df422 100644
--- a/metadata/md5-cache/dev-util/debhelper-12.7.2
+++ b/metadata/md5-cache/dev-util/debhelper-12.7.2
@@ -7,7 +7,8 @@ IUSE=test l10n_de l10n_es l10n_fr
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_12.7.2.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e0b59ccfc43fe797b946ca341a13367c
+_md5_=0c3734818c2d1c6cf1af678aeb656147
diff --git a/metadata/md5-cache/dev-util/debhelper-9.20160814 b/metadata/md5-cache/dev-util/debhelper-9.20160814
index 8f3a2a53eac5..d4bdb41b633b 100644
--- a/metadata/md5-cache/dev-util/debhelper-9.20160814
+++ b/metadata/md5-cache/dev-util/debhelper-9.20160814
@@ -7,7 +7,8 @@ IUSE=test l10n_de l10n_es l10n_fr
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_9.20160814.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8bc46ba433f4491dc384c37b70e77223
+_md5_=de99f6cd2f97c178dbe505229baa705e
diff --git a/metadata/md5-cache/dev-util/distro-info-0.14 b/metadata/md5-cache/dev-util/distro-info-0.14
index 8375eb3ba312..c3080f9e1e4b 100644
--- a/metadata/md5-cache/dev-util/distro-info-0.14
+++ b/metadata/md5-cache/dev-util/distro-info-0.14
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=dev-lang/perl:= python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-util/distro-info-data
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/distro-info/distro-info_0.14.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=475b28bb0f5ab8f12331dbf90f5f60e9
+_md5_=0f1b01d2dde11ba51ea7204003ae5865
diff --git a/metadata/md5-cache/dev-util/distro-info-0.22 b/metadata/md5-cache/dev-util/distro-info-0.22
index dd2906642efa..5adf0dbbace3 100644
--- a/metadata/md5-cache/dev-util/distro-info-0.22
+++ b/metadata/md5-cache/dev-util/distro-info-0.22
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=dev-lang/perl:= python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-util/distro-info-data
 REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/distro-info/distro-info_0.22.tar.xz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d72d7cdbc8bab9699aa6df9103620574
+_md5_=0bdaa075d3cc61ad6cb95e77e59db24e
diff --git a/metadata/md5-cache/dev-util/findbugs-3.0.1 b/metadata/md5-cache/dev-util/findbugs-3.0.1
index ea852b0ae8e0..4fb2a88e5ba8 100644
--- a/metadata/md5-cache/dev-util/findbugs-3.0.1
+++ b/metadata/md5-cache/dev-util/findbugs-3.0.1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.7 dev-java/ant-core:0 dev-java/apple-java-extensions-bin:0 >=dev-java/asm-5:4 >=dev-java/bcel-6:0 dev-java/commons-lang:2.1 dev-java/dom4j:1 dev-java/hamcrest-core:1.3 dev-java/jaxen:1.1 dev-java/jcip-annotations:0 dev-java/jdepend:0 >=dev-java/jformatstring-2.0.3:0 dev-java/jsr305:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4b93e1ca964013bde01f0d8ef06db610
+_md5_=2c82e09ef1e55234bbd9e6991900f1dc
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.30.3 b/metadata/md5-cache/dev-util/gnome-builder-3.30.3
index 5733e080d14c..0d12f8c8c4c7 100644
--- a/metadata/md5-cache/dev-util/gnome-builder-3.30.3
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.30.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
 RDEPEND=>=dev-libs/libdazzle-3.30.2[introspection,vala?] >=dev-libs/glib-2.58.0:2 >=x11-libs/gtk+-3.24.0:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.30.1[vala?] >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/template-glib-3.28.0[introspection,vala?] >=x11-libs/vte-0.40.2:2.91[vala?] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.25.0[ssh] ) dev-libs/libpcre:3 webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) >=dev-libs/gobject-introspection-1.48.0:= >=dev-python/pygobject-3.22.0:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) sysprof? ( >=dev-util/sysprof-3.30.2[gtk] ) vala? ( dev-lang/vala:= || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/3.30/gnome-builder-3.30.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fef86d89750247c6a749b0a5af37b385
+_md5_=39b1afca6e52580dfa32ec9126483f48
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.6.2 b/metadata/md5-cache/dev-util/google-perftools-2.6.2
index fd269a7d2a2f..50b429c6ae62 100644
--- a/metadata/md5-cache/dev-util/google-perftools-2.6.2
+++ b/metadata/md5-cache/dev-util/google-perftools-2.6.2
@@ -7,7 +7,8 @@ IUSE=largepages +debug minimal optimisememory test static-libs abi_x86_32 abi_x8
 KEYWORDS=-* amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=sys-libs/libunwind
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.6.2 -> gperftools-2.6.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=3f37048fc9ccd40e56609527334d7136
+_md5_=7762f163f9df9380be2c1c21ae9aba09
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.7 b/metadata/md5-cache/dev-util/google-perftools-2.7
index ea1cf57c4d66..06d6ca5669e0 100644
--- a/metadata/md5-cache/dev-util/google-perftools-2.7
+++ b/metadata/md5-cache/dev-util/google-perftools-2.7
@@ -7,7 +7,8 @@ IUSE=largepages +debug minimal optimisememory test static-libs abi_x86_32 abi_x8
 KEYWORDS=-* ~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=sys-libs/libunwind
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.7 -> gperftools-2.7.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=c1e0fc3f134f98aa9403cab9c842b83e
+_md5_=be15e1b4ad410044311f9edeeaa9c0cd
diff --git a/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.4 b/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.4
index 8aa61aec14e3..7783fc2ebaa0 100644
--- a/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.4
+++ b/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.4
@@ -8,7 +8,8 @@ IUSE=doc test
 KEYWORDS=~amd64
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KDAB/KDStateMachineEditor/releases/download/v1.2.4/kdstatemachineeditor-1.2.4.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e2f33e2720209e980ce91193e79d4e4
+_md5_=c08196470fd6317a53d72be94e4a6ca6
diff --git a/metadata/md5-cache/dev-util/kdstatemachineeditor-9999 b/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
index ff977bbb7441..929fbe0a83ba 100644
--- a/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
+++ b/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
@@ -8,6 +8,7 @@ IUSE=doc test
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e2f33e2720209e980ce91193e79d4e4
+_md5_=c08196470fd6317a53d72be94e4a6ca6
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2 b/metadata/md5-cache/dev-util/ninja-1.8.2
index 70a06a1ccaa6..c957e7bfa4da 100644
--- a/metadata/md5-cache/dev-util/ninja-1.8.2
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2
@@ -7,7 +7,8 @@ IUSE=doc emacs test vim-syntax
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) !<net-irc/ninja-1.5.9_pre14-r1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=48a3d21b17a29329eafd95f1e83b61a3
+_md5_=e995f2c7e3b84005491747070747be01
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2-r1 b/metadata/md5-cache/dev-util/ninja-1.8.2-r1
index 8705fb53b093..a66eb647ba1e 100644
--- a/metadata/md5-cache/dev-util/ninja-1.8.2-r1
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2-r1
@@ -7,7 +7,8 @@ IUSE=doc emacs test vim-syntax
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) !<net-irc/ninja-1.5.9_pre14-r1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6c4692ea2a05d51a225829914f0c4aa4
+_md5_=7005c1855114dcaacbca4ea474700005
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2-r2 b/metadata/md5-cache/dev-util/ninja-1.8.2-r2
index 749c59de89f5..d5438af439ea 100644
--- a/metadata/md5-cache/dev-util/ninja-1.8.2-r2
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2-r2
@@ -7,7 +7,8 @@ IUSE=doc emacs test vim-syntax
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) !<net-irc/ninja-1.5.9_pre14-r1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kitware/ninja/archive/v1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5d8707ada65f952fafd1f79d47d96844
+_md5_=6e4ddf639f1aa89910cf0f940549990c
diff --git a/metadata/md5-cache/dev-util/ninja-1.9.0 b/metadata/md5-cache/dev-util/ninja-1.9.0
index 532f764ed2c2..40b075770295 100644
--- a/metadata/md5-cache/dev-util/ninja-1.9.0
+++ b/metadata/md5-cache/dev-util/ninja-1.9.0
@@ -7,7 +7,8 @@ IUSE=doc emacs test vim-syntax
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kitware/ninja/archive/v1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d967dfa96d277dd2d6d136da284e1853
+_md5_=6833b921a05cc3d54de70c6970f513b9
diff --git a/metadata/md5-cache/dev-util/ninja-9999 b/metadata/md5-cache/dev-util/ninja-9999
index f2b88d71c6b9..bb3cf32cecf1 100644
--- a/metadata/md5-cache/dev-util/ninja-9999
+++ b/metadata/md5-cache/dev-util/ninja-9999
@@ -7,6 +7,7 @@ IUSE=doc emacs test vim-syntax
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4ee8114f47ea20d8b6d81babadde5e5b
+_md5_=d9c17d5a8fa77ab3fc9fa8968d1b8aef
diff --git a/metadata/md5-cache/dev-util/patchutils-0.3.3 b/metadata/md5-cache/dev-util/patchutils-0.3.3
index 621d510681de..dac139f427e2 100644
--- a/metadata/md5-cache/dev-util/patchutils-0.3.3
+++ b/metadata/md5-cache/dev-util/patchutils-0.3.3
@@ -6,7 +6,8 @@ HOMEPAGE=http://cyberelk.net/tim/patchutils/
 IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6f9489863876b04bfc7f5647b5e4f3d1
+_md5_=82830c5547836c9ec8be7f42c5c5727a
diff --git a/metadata/md5-cache/dev-util/patchutils-0.3.4 b/metadata/md5-cache/dev-util/patchutils-0.3.4
index 08a36200cbc0..6ded9d925c9e 100644
--- a/metadata/md5-cache/dev-util/patchutils-0.3.4
+++ b/metadata/md5-cache/dev-util/patchutils-0.3.4
@@ -6,6 +6,7 @@ HOMEPAGE=http://cyberelk.net/tim/patchutils/
 IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.4.tar.xz
-_md5_=4f4fb0cdd0cc8250fa89b6a9868d591b
+_md5_=71a674a7bc300c373fea1565478a3c9d
diff --git a/metadata/md5-cache/dev-util/rosdep-0.13.0 b/metadata/md5-cache/dev-util/rosdep-0.13.0
index bba2c6fe1299..e49ac9010997 100644
--- a/metadata/md5-cache/dev-util/rosdep-0.13.0
+++ b/metadata/md5-cache/dev-util/rosdep-0.13.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/rosdep/rosdep-0.13.0.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.13.0.tar.gz -> rosdep-0.13.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=51136e6365b4dbda87b16f83aab6211a
+_md5_=67f81ffc6f1e235948ae12ee24199ae4
diff --git a/metadata/md5-cache/dev-util/rosdep-0.14.0 b/metadata/md5-cache/dev-util/rosdep-0.14.0
index 4d133e529e85..1b7bb2429ff8 100644
--- a/metadata/md5-cache/dev-util/rosdep-0.14.0
+++ b/metadata/md5-cache/dev-util/rosdep-0.14.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/rosdep/rosdep-0.14.0.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.14.0.tar.gz -> rosdep-0.14.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=51136e6365b4dbda87b16f83aab6211a
+_md5_=67f81ffc6f1e235948ae12ee24199ae4
diff --git a/metadata/md5-cache/dev-util/rosdep-0.15.0 b/metadata/md5-cache/dev-util/rosdep-0.15.0
index 18297d8cddca..a69b4916c10e 100644
--- a/metadata/md5-cache/dev-util/rosdep-0.15.0
+++ b/metadata/md5-cache/dev-util/rosdep-0.15.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/rosdep/rosdep-0.15.0.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.15.0.tar.gz -> rosdep-0.15.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=51136e6365b4dbda87b16f83aab6211a
+_md5_=67f81ffc6f1e235948ae12ee24199ae4
diff --git a/metadata/md5-cache/dev-util/rosdep-9999 b/metadata/md5-cache/dev-util/rosdep-9999
index b8bcbdb4f219..d2807834e9f7 100644
--- a/metadata/md5-cache/dev-util/rosdep-9999
+++ b/metadata/md5-cache/dev-util/rosdep-9999
@@ -9,6 +9,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=51136e6365b4dbda87b16f83aab6211a
+_md5_=67f81ffc6f1e235948ae12ee24199ae4
diff --git a/metadata/md5-cache/dev-util/rosinstall-0.7.8 b/metadata/md5-cache/dev-util/rosinstall-0.7.8
index 81b87b277d82..be75f8dac6e6 100644
--- a/metadata/md5-cache/dev-util/rosinstall-0.7.8
+++ b/metadata/md5-cache/dev-util/rosinstall-0.7.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/catkin_pkg[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-util/wstool-0.1.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/rosinstall/rosinstall-0.7.8.tar.gz https://github.com/vcstools/rosinstall/archive/0.7.8.tar.gz -> rosinstall-0.7.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d84f92ccb2f46997ceaa2140ed6d0f7
+_md5_=c295d419575a4b08616b80d36732a41c
diff --git a/metadata/md5-cache/dev-util/rosinstall-9999 b/metadata/md5-cache/dev-util/rosinstall-9999
index 93c70e180dcd..77ca67aad04a 100644
--- a/metadata/md5-cache/dev-util/rosinstall-9999
+++ b/metadata/md5-cache/dev-util/rosinstall-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-python/catkin_pkg[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-util/wstool-0.1.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d84f92ccb2f46997ceaa2140ed6d0f7
+_md5_=c295d419575a4b08616b80d36732a41c
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.14 b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.14
index 4482402294a7..d030c0853dc7 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.14
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.14
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosinstall_generator/archive/0.1.14.tar.gz -> rosinstall_generator-0.1.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c28a82aacf90475a955c88ca192bd931
+_md5_=a6d629151d7251f78f740ed7374d6268
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-9999 b/metadata/md5-cache/dev-util/rosinstall_generator-9999
index fbaa467ee45d..8a3cc3a52729 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-9999
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c28a82aacf90475a955c88ca192bd931
+_md5_=a6d629151d7251f78f740ed7374d6268
diff --git a/metadata/md5-cache/dev-util/schroot-1.6.10-r4 b/metadata/md5-cache/dev-util/schroot-1.6.10-r4
index 0f6f5ff9da5b..435f4bb742d8 100644
--- a/metadata/md5-cache/dev-util/schroot-1.6.10-r4
+++ b/metadata/md5-cache/dev-util/schroot-1.6.10-r4
@@ -7,7 +7,8 @@ IUSE=btrfs +dchroot debug doc lvm nls pam test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.42.0 >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.10.orig.tar.xz mirror://debian/pool/main/s/schroot/schroot_1.6.10-2.debian.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=880939d1ab1916c47f4355756dd2c04c
+_md5_=e232eb0c85176c339d941c287de3cb8f
diff --git a/metadata/md5-cache/dev-util/spec-cleaner-1.0.6 b/metadata/md5-cache/dev-util/spec-cleaner-1.0.6
index 721c1e6bd85b..8bd9ae8b06c3 100644
--- a/metadata/md5-cache/dev-util/spec-cleaner-1.0.6
+++ b/metadata/md5-cache/dev-util/spec-cleaner-1.0.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] >=app-arch/rpm-4.11.0.1 python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openSUSE/spec-cleaner/archive/spec-cleaner-1.0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=418b6e7fa73b840a1169e8427a1dbf20
+_md5_=43255b5619bac587d19d97d3653ff5ea
diff --git a/metadata/md5-cache/dev-util/spec-cleaner-1.0.7 b/metadata/md5-cache/dev-util/spec-cleaner-1.0.7
index e9ae596dc2de..362dcb76dc86 100644
--- a/metadata/md5-cache/dev-util/spec-cleaner-1.0.7
+++ b/metadata/md5-cache/dev-util/spec-cleaner-1.0.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-arch/rpm-4.11.0.1 python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openSUSE/spec-cleaner/archive/spec-cleaner-1.0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2be666d5103abbbd0caf76835fc38679
+_md5_=6afdfca954d9f6809a60f5d3bc095d06
diff --git a/metadata/md5-cache/dev-util/spec-cleaner-9999 b/metadata/md5-cache/dev-util/spec-cleaner-9999
index 70969cee37e0..5ee5b89dfadd 100644
--- a/metadata/md5-cache/dev-util/spec-cleaner-9999
+++ b/metadata/md5-cache/dev-util/spec-cleaner-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-arch/rpm-4.11.0.1 python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2be666d5103abbbd0caf76835fc38679
+_md5_=6afdfca954d9f6809a60f5d3bc095d06
diff --git a/metadata/md5-cache/dev-util/uncrustify-0.66.1 b/metadata/md5-cache/dev-util/uncrustify-0.66.1
index 2ad2d93aea84..303214c4ad67 100644
--- a/metadata/md5-cache/dev-util/uncrustify-0.66.1
+++ b/metadata/md5-cache/dev-util/uncrustify-0.66.1
@@ -6,7 +6,8 @@ HOMEPAGE=http://uncrustify.sourceforge.net/
 IUSE=test
 KEYWORDS=amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.66.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9684574bbee8086f4b80172430ea3a85
+_md5_=f77a14c3cc699f60b68782262ce9056e
diff --git a/metadata/md5-cache/dev-util/uncrustify-0.68.1 b/metadata/md5-cache/dev-util/uncrustify-0.68.1
index bfd221c96b7e..b0db598fc01d 100644
--- a/metadata/md5-cache/dev-util/uncrustify-0.68.1
+++ b/metadata/md5-cache/dev-util/uncrustify-0.68.1
@@ -6,7 +6,8 @@ HOMEPAGE=http://uncrustify.sourceforge.net/
 IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a68786b344d22eea7452a3546e467e0c
+_md5_=24347f490869e11d3f7c6f95a409481d
diff --git a/metadata/md5-cache/dev-util/uncrustify-0.69.0 b/metadata/md5-cache/dev-util/uncrustify-0.69.0
index 1ad61ecca8e8..db2f08f41b0f 100644
--- a/metadata/md5-cache/dev-util/uncrustify-0.69.0
+++ b/metadata/md5-cache/dev-util/uncrustify-0.69.0
@@ -6,7 +6,8 @@ HOMEPAGE=http://uncrustify.sourceforge.net/
 IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uncrustify/uncrustify/archive/uncrustify-0.69.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a68786b344d22eea7452a3546e467e0c
+_md5_=24347f490869e11d3f7c6f95a409481d
diff --git a/metadata/md5-cache/dev-util/uncrustify-9999 b/metadata/md5-cache/dev-util/uncrustify-9999
index c300f255b5c0..ce01512c03a5 100644
--- a/metadata/md5-cache/dev-util/uncrustify-9999
+++ b/metadata/md5-cache/dev-util/uncrustify-9999
@@ -6,6 +6,7 @@ HOMEPAGE=http://uncrustify.sourceforge.net/
 IUSE=test
 LICENSE=GPL-2
 PROPERTIES=live
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a68786b344d22eea7452a3546e467e0c
+_md5_=24347f490869e11d3f7c6f95a409481d
diff --git a/metadata/md5-cache/dev-util/vint-0.3.18 b/metadata/md5-cache/dev-util/vint-0.3.18
index 77dc3db7c480..68e7bf657047 100644
--- a/metadata/md5-cache/dev-util/vint-0.3.18
+++ b/metadata/md5-cache/dev-util/vint-0.3.18
@@ -8,7 +8,8 @@ KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=dev-python/ansicolor-0.2.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kuniwak/vint/archive/v0.3.18.tar.gz -> vint-0.3.18.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c402c614a8bc3c874a62157bc338598
+_md5_=f9489cc8666a182c46dd861c8bb299d1
diff --git a/metadata/md5-cache/dev-util/vint-0.3.19 b/metadata/md5-cache/dev-util/vint-0.3.19
index f6efdca2ee4c..862528a13fc1 100644
--- a/metadata/md5-cache/dev-util/vint-0.3.19
+++ b/metadata/md5-cache/dev-util/vint-0.3.19
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-python/ansicolor-0.2.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kuniwak/vint/archive/v0.3.19.tar.gz -> vint-0.3.19.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2232d1d812ed2c9def25fcaf5d647762
+_md5_=d164c125e8a68d5f02e1fbe7893162b8
diff --git a/metadata/md5-cache/dev-util/wiggle-0.9-r1 b/metadata/md5-cache/dev-util/wiggle-0.9-r1
index dc768a6084de..eed21912922d 100644
--- a/metadata/md5-cache/dev-util/wiggle-0.9-r1
+++ b/metadata/md5-cache/dev-util/wiggle-0.9-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://neil.brown.name/wiggle/wiggle-0.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f35896e3918122fe7ed8c57abd48dae7
+_md5_=44ecb554ba16eda3336f53c5a03edf5e
diff --git a/metadata/md5-cache/dev-util/wiggle-1.0 b/metadata/md5-cache/dev-util/wiggle-1.0
index ae18e1b6c274..fe7ea7a9ed79 100644
--- a/metadata/md5-cache/dev-util/wiggle-1.0
+++ b/metadata/md5-cache/dev-util/wiggle-1.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://neil.brown.name/wiggle/wiggle-1.0.tar.gz
 _eclasses_=fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5ccc6a4d0d69ee2efb640b258abde05e
+_md5_=6ff8bf73bb075c9e9c357930cda6b080
diff --git a/metadata/md5-cache/dev-util/wstool-0.1.13 b/metadata/md5-cache/dev-util/wstool-0.1.13
index d4cdef5fc3fc..5031713b5f68 100644
--- a/metadata/md5-cache/dev-util/wstool-0.1.13
+++ b/metadata/md5-cache/dev-util/wstool-0.1.13
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/wstool/wstool-0.1.13.tar.gz https://github.com/vcstools/wstool/archive/0.1.13.tar.gz -> wstool-0.1.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a127bf5837ee5be7a9416fca824292d
+_md5_=412d5e1228105b2b0a1ba002867ca546
diff --git a/metadata/md5-cache/dev-util/wstool-0.1.17 b/metadata/md5-cache/dev-util/wstool-0.1.17
index 7b7f07bc43e8..9e0482389108 100644
--- a/metadata/md5-cache/dev-util/wstool-0.1.17
+++ b/metadata/md5-cache/dev-util/wstool-0.1.17
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/wstool/wstool-0.1.17.tar.gz https://github.com/vcstools/wstool/archive/0.1.17.tar.gz -> wstool-0.1.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8afb3f9a0505942e07c279e0aa8ec75
+_md5_=a737d5af844b31711468c03029f98e2f
diff --git a/metadata/md5-cache/dev-util/wstool-9999 b/metadata/md5-cache/dev-util/wstool-9999
index 474fad2df3f1..7d1017239a01 100644
--- a/metadata/md5-cache/dev-util/wstool-9999
+++ b/metadata/md5-cache/dev-util/wstool-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8afb3f9a0505942e07c279e0aa8ec75
+_md5_=a737d5af844b31711468c03029f98e2f
diff --git a/metadata/md5-cache/dev-util/xdelta-3.1.0 b/metadata/md5-cache/dev-util/xdelta-3.1.0
index ed3ee1d91d83..21f483515d2d 100644
--- a/metadata/md5-cache/dev-util/xdelta-3.1.0
+++ b/metadata/md5-cache/dev-util/xdelta-3.1.0
@@ -7,7 +7,8 @@ IUSE=examples test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/xz-utils
+RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/jmacd/xdelta-gpl/releases/download/v3.1.0/xdelta3-3.1.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0c9fff4b0ba24746bbfe27c79d810698
+_md5_=88c360428fbf3f21e678d978213b94a2
diff --git a/metadata/md5-cache/dev-vcs/cssc-1.4.0 b/metadata/md5-cache/dev-vcs/cssc-1.4.0
index 0b74f1067acb..63b8334d62e9 100644
--- a/metadata/md5-cache/dev-vcs/cssc-1.4.0
+++ b/metadata/md5-cache/dev-vcs/cssc-1.4.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://www.gnu.org/software/cssc/
 IUSE=test valgrind
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/cssc/CSSC-1.4.0.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_=657e8ff1816cb99ccc0ca9d3d3bb7be3
+_md5_=aeeec06e0c2548733784057b4005ebaa
diff --git a/metadata/md5-cache/dev-vcs/cssc-1.4.1 b/metadata/md5-cache/dev-vcs/cssc-1.4.1
index bf286206f468..77a72f965342 100644
--- a/metadata/md5-cache/dev-vcs/cssc-1.4.1
+++ b/metadata/md5-cache/dev-vcs/cssc-1.4.1
@@ -7,7 +7,8 @@ HOMEPAGE=https://www.gnu.org/software/cssc/
 IUSE=test valgrind
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/cssc/CSSC-1.4.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=407181082d061c410e834bc3b07d4517
+_md5_=70fd4f6e492413d675209f626154869c
diff --git a/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1 b/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
index da39a55c241f..bfc76b440f50 100644
--- a/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
+++ b/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/subversion-1.0.9 bazaar? ( >=dev-vcs/bzr-1.13 ) git? ( >=dev-vcs/git-1.5.4.4 ) dev-vcs/rcs 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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://cvs2svn.tigris.org/files/documents/1462/49237/cvs2svn-2.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5826396524fe8b1416445070839c4807
+_md5_=ccc9399647489465f2d253a824eb8804
diff --git a/metadata/md5-cache/dev-vcs/cvs2svn-2.5.0 b/metadata/md5-cache/dev-vcs/cvs2svn-2.5.0
index dd7566710bb1..d11f4c70fc8f 100644
--- a/metadata/md5-cache/dev-vcs/cvs2svn-2.5.0
+++ b/metadata/md5-cache/dev-vcs/cvs2svn-2.5.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/subversion-1.0.9 bazaar? ( >=dev-vcs/bzr-1.13 ) git? ( >=dev-vcs/git-1.5.4.4 ) dev-vcs/rcs 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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://cvs2svn.tigris.org/files/documents/1462/49543/cvs2svn-2.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac7f5f62cbd87e8954e0cd5e0607e086
+_md5_=65337311c51e6ec65d592b60ce1221c2
diff --git a/metadata/md5-cache/dev-vcs/darcs-2.8.4-r6 b/metadata/md5-cache/dev-vcs/darcs-2.8.4-r6
index 623c698a7c9e..9d3bd546c828 100644
--- a/metadata/md5-cache/dev-vcs/darcs-2.8.4-r6
+++ b/metadata/md5-cache/dev-vcs/darcs-2.8.4-r6
@@ -7,7 +7,8 @@ IUSE=doc test doc hscolour profile
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND==dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/hashed-storage-0.5.6:=[profile?] <dev-haskell/hashed-storage-0.6:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] =dev-haskell/html-1.0*:=[profile?] =dev-haskell/mmap-0.5*:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] =dev-haskell/random-1.0*:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] >=dev-haskell/tar-0.3:=[profile?] <dev-haskell/tar-0.5:=[profile?] >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-haskell/zlib-0.5.1.0:=[profile?] <dev-haskell/zlib-0.6.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= net-misc/curl
+RESTRICT=!test? ( test )
 SLOT=0/2.8.4
 SRC_URI=https://hackage.haskell.org/package/darcs-2.8.4/darcs-2.8.4.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	948a587ac6d4225d6ac96ddbd7c1c4e3	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f254159c991f9f5b8a87149bb210846c
+_md5_=0ff4ad747a851e9bbb544cd9fc93f1ff
diff --git a/metadata/md5-cache/dev-vcs/git-cola-2.11 b/metadata/md5-cache/dev-vcs/git-cola-2.11
index baf420e3afcb..cc788ba08437 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-2.11
+++ b/metadata/md5-cache/dev-vcs/git-cola-2.11
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/QtPy[gui,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[gui,network,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-vcs/git 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v2.11.tar.gz -> git-cola-2.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=acb0464403de7515378de9040e4b515a
+_md5_=736f836e16efb026658962f5f05c0a89
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.2 b/metadata/md5-cache/dev-vcs/git-cola-3.2
index 5561adc06ae7..234425fbea43 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-3.2
+++ b/metadata/md5-cache/dev-vcs/git-cola-3.2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/QtPy[gui,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-vcs/git 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v3.2.tar.gz -> git-cola-3.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=1efdc45720880f4c1964643fdaf54a9f
+_md5_=8d5e61596e8e0576f323a6ef687d80e3
diff --git a/metadata/md5-cache/dev-vcs/git-deploy-6.0.1_p20131024-r1 b/metadata/md5-cache/dev-vcs/git-deploy-6.0.1_p20131024-r1
index 5fadaafbbe52..a829fc198418 100644
--- a/metadata/md5-cache/dev-vcs/git-deploy-6.0.1_p20131024-r1
+++ b/metadata/md5-cache/dev-vcs/git-deploy-6.0.1_p20131024-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:= dev-vcs/git virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes virtual/perl-Memoize virtual/perl-Data-Dumper
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/git-deploy/git-deploy/archive/e9ef93debd12d85e70676dd79b4bd78ac2b05271.tar.gz -> git-deploy-6.0.1_p20131024.tar.gz
 _eclasses_=perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b
-_md5_=9753c6cd43055474bb1dc9e0466776d7
+_md5_=9ff3454a8cf3fbefd76f31560b9c4c34
diff --git a/metadata/md5-cache/dev-vcs/git-mantle-0.6 b/metadata/md5-cache/dev-vcs/git-mantle-0.6
index c7c9f87f11b3..90cb36241e1d 100644
--- a/metadata/md5-cache/dev-vcs/git-mantle-0.6
+++ b/metadata/md5-cache/dev-vcs/git-mantle-0.6
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-vcs/git app-shells/zsh
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://codex.sigpipe.cz/git-mantle/git-mantle-0.6.tar.gz
-_md5_=c12350d398daeec82d1c1dbc441152d4
+_md5_=af6d1b06fb00cfb834fdaadf8cf01503
diff --git a/metadata/md5-cache/dev-vcs/git-pimp-0.8 b/metadata/md5-cache/dev-vcs/git-pimp-0.8
index 45ed4aabaf47..cabe8eb6f7c6 100644
--- a/metadata/md5-cache/dev-vcs/git-pimp-0.8
+++ b/metadata/md5-cache/dev-vcs/git-pimp-0.8
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-vcs/git app-shells/zsh dev-vcs/git-mailz dev-vcs/git-mantle
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://codex.sigpipe.cz/git-pimp/git-pimp-0.8.tar.gz
-_md5_=2781165537f4ff54496251bbc17df26e
+_md5_=0642235076dab04e7236b9653dc08bfe
diff --git a/metadata/md5-cache/dev-vcs/gitinspector-0.4.4 b/metadata/md5-cache/dev-vcs/gitinspector-0.4.4
index dc0f47e5c667..44e5f1382f98 100644
--- a/metadata/md5-cache/dev-vcs/gitinspector-0.4.4
+++ b/metadata/md5-cache/dev-vcs/gitinspector-0.4.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=dev-vcs/git python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ejwa/gitinspector/archive/v0.4.4.tar.gz -> gitinspector-0.4.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=742560481f0a4d29030dde9fe1a1e52e
+_md5_=7cc6d1b7db2558ef7746a5156768d832
diff --git a/metadata/md5-cache/dev-vcs/hgsubversion-1.9.2 b/metadata/md5-cache/dev-vcs/hgsubversion-1.9.2
index ec23fca1c410..c5113497bc33 100644
--- a/metadata/md5-cache/dev-vcs/hgsubversion-1.9.2
+++ b/metadata/md5-cache/dev-vcs/hgsubversion-1.9.2
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/mercurial-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/subvertpy-0.7.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/subversion-1.5[python] ) python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hgsubversion/hgsubversion-1.9.2.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5bba525d089fa5de023456518eb4703a
+_md5_=e710ce63210dba2bb8847c2276c848ab
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-1.13.0 b/metadata/md5-cache/dev-vcs/python-gitlab-1.13.0
index 21af36509d7e..e5364caeeffc 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-1.13.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-1.13.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=LGPL-3
 RDEPEND=dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-1.13.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=23332678e22e296784dd0d5bb962d0db
+_md5_=fa7882067a429429699ad968a6b8c763
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-1.7.0 b/metadata/md5-cache/dev-vcs/python-gitlab-1.7.0
index 68871db84258..d590026c45c1 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-1.7.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-1.7.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=LGPL-3
 RDEPEND=dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-1.7.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=23332678e22e296784dd0d5bb962d0db
+_md5_=fa7882067a429429699ad968a6b8c763
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-1.8.0 b/metadata/md5-cache/dev-vcs/python-gitlab-1.8.0
index 2d3977c6837d..ff96b33cb686 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-1.8.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-1.8.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=LGPL-3
 RDEPEND=dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-1.8.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=23332678e22e296784dd0d5bb962d0db
+_md5_=fa7882067a429429699ad968a6b8c763
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-1.9.0 b/metadata/md5-cache/dev-vcs/python-gitlab-1.9.0
index ac1aef2b9a18..0f99d194203f 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-1.9.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-1.9.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=LGPL-3
 RDEPEND=dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-1.9.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=23332678e22e296784dd0d5bb962d0db
+_md5_=fa7882067a429429699ad968a6b8c763
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.12.2 b/metadata/md5-cache/dev-vcs/subversion-1.12.2
index 3366988e105f..58234c666d41 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.12.2
+++ b/metadata/md5-cache/dev-vcs/subversion-1.12.2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-l
 LICENSE=Subversion GPL-2
 RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_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(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_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(-)] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.8 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.12.2.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e328f34d3e76af9c27facf8f9080a6d
+_md5_=08aee2fae5c1182be17d7a051a547ceb
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.13.0 b/metadata/md5-cache/dev-vcs/subversion-1.13.0
index 10a31d32fefb..0e17feab8107 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.13.0
+++ b/metadata/md5-cache/dev-vcs/subversion-1.13.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-li
 LICENSE=Subversion GPL-2
 RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_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(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_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(-)] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.8 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.13.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c18611dcd58b5c60a07ab4941eddc68a
+_md5_=f4b4c6dd729e0339e73823f88a0f6337
diff --git a/metadata/md5-cache/games-strategy/colobot-0.1.11 b/metadata/md5-cache/games-strategy/colobot-0.1.11
index bc73c70af712..dabf4a33e4b9 100644
--- a/metadata/md5-cache/games-strategy/colobot-0.1.11
+++ b/metadata/md5-cache/games-strategy/colobot-0.1.11
@@ -7,7 +7,8 @@ IUSE=devbuild test tools doc +openal
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) games-strategy/colobot-data
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/colobot/colobot/archive/colobot-gold-0.1.11-alpha.tar.gz -> colobot-0.1.11.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad783f8a596504d8870d77a3fc106d91
+_md5_=6843400b432c4a41b5b2c7cca3545e9d
diff --git a/metadata/md5-cache/gnome-base/gdm-3.30.3-r3 b/metadata/md5-cache/gnome-base/gdm-3.30.3-r3
index 4f05a1d16066..5c00fe5e3014 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.30.3-r3
+++ b/metadata/md5-cache/gnome-base/gdm-3.30.3-r3
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86
 LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44:2 dev-libs/libgudev >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.35 x11-base/xorg-server x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 sys-libs/pam elogind? ( >=sys-auth/elogind-239.3[pam] ) systemd? ( >=sys-apps/systemd-186:0=[pam] ) sys-auth/pambase[elogind?,systemd?] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
 REQUIRED_USE=^^ ( elogind systemd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.30/gdm-3.30.3.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48033ed5ba5cb9e0ff83dbdbc5516497
+_md5_=f8f28fd589c90aa9d90bb01da88db5b0
diff --git a/metadata/md5-cache/gnome-base/gdm-3.32.0 b/metadata/md5-cache/gnome-base/gdm-3.32.0
index db8d864f52d7..eb14fa6fed5a 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.32.0
+++ b/metadata/md5-cache/gnome-base/gdm-3.32.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86
 LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44:2 dev-libs/libgudev >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.35 x11-base/xorg-server x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 sys-libs/pam elogind? ( >=sys-auth/elogind-239.3[pam] ) systemd? ( >=sys-apps/systemd-186:0=[pam] ) sys-auth/pambase[elogind?,systemd?] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
 REQUIRED_USE=^^ ( elogind systemd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.32/gdm-3.32.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ddef4fdc2f1bb7795c6599e3f9d2fe82
+_md5_=7631b387de43aa942145174da23accc7
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.28.2 b/metadata/md5-cache/gnome-base/gnome-keyring-3.28.2
index 85fbec2118fb..883715859c29 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.28.2
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.28.2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=app-crypt/pinentry[gnome-keyring]
 RDEPEND=>=app-crypt/gcr-3.27.90:=[gtk] >=dev-libs/glib-2.44:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:= ssh-agent? ( net-misc/openssh )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.28/gnome-keyring-3.28.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b3e781a76608f5a855a6d3a39fcbcfa2
+_md5_=738bc057419bb0b1dd65608796f9f1df
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.31.91-r1 b/metadata/md5-cache/gnome-base/gnome-keyring-3.31.91-r1
index 4b14b93d725d..83f302dc56ea 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.31.91-r1
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.31.91-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=app-crypt/pinentry[gnome-keyring]
 RDEPEND=>=app-crypt/gcr-3.27.90:=[gtk] >=dev-libs/glib-2.44:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:= ssh-agent? ( net-misc/openssh )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.31/gnome-keyring-3.31.91.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0faeb2aab665733662dca5f6e43bf38
+_md5_=5315af2257ae803da4c1ea7a210cc19d
diff --git a/metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1 b/metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1
index 7671ce994f16..edc5b1add62d 100644
--- a/metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1
+++ b/metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1
@@ -7,7 +7,8 @@ IUSE=+introspection test debug
 KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) !<gnome-base/gnome-menus-3.0.1-r1:0
+RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gnome-menus/3.13/gnome-menus-3.13.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7d83370e0bb01d29c9e9a68ed96311c
+_md5_=0d57ed42130acaf7bf185a7b23aa8335
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.38.3 b/metadata/md5-cache/gnome-base/gvfs-1.38.3
index 63ae22ef80e5..c021775918fb 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.38.3
+++ b/metadata/md5-cache/gnome-base/gvfs-1.38.3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.57.2:2 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-2.42.0:2.4 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8 ) net-misc/openssh
 REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.38/gvfs-1.38.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c44843831656ad5979bd6f4492c3d36
+_md5_=ab45de21a4d9bc912775f1b3e9c6cb90
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.40.2 b/metadata/md5-cache/gnome-base/gvfs-1.40.2
index ec4d129a63e8..6db52ea546a8 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.40.2
+++ b/metadata/md5-cache/gnome-base/gvfs-1.40.2
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.57.2:2 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-2.58.0:2.4 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8 ) net-misc/openssh
 REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.40/gvfs-1.40.2.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a8ee3454de266f1e02eca928d7527f7
+_md5_=553a0f1e8973334cd338770738934070
diff --git a/metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1 b/metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1
index 9f1dcda2c4fa..9f618808e4ea 100644
--- a/metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1
+++ b/metadata/md5-cache/gnome-base/libbonoboui-2.24.5-r1
@@ -7,7 +7,8 @@ IUSE=examples test test
 KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=gnome-base/libgnomecanvas-1.116 >=gnome-base/libbonobo-2.22 >=gnome-base/libgnome-2.13.7 >=dev-libs/libxml2-2.4.20:2 >=gnome-base/gconf-2:2 >=x11-libs/gtk+-2.8.12:2 >=dev-libs/glib-2.6.0:2 >=gnome-base/libglade-1.99.11:2.0 >=dev-libs/popt-1.5
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libbonoboui/2.24/libbonoboui-2.24.5.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=384a4cb48de379068cf306bc18a95284
+_md5_=83f5eda943463c1248b8793895bb3d6a
diff --git a/metadata/md5-cache/gnome-base/libglade-2.6.4-r2 b/metadata/md5-cache/gnome-base/libglade-2.6.4-r2
index 3e10a0b4b9ff..86aaa765303a 100644
--- a/metadata/md5-cache/gnome-base/libglade-2.6.4-r2
+++ b/metadata/md5-cache/gnome-base/libglade-2.6.4-r2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-li
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.10.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( python_single_target_pypy? ( >=virtual/pypy-5:0=[xml(+)] >=dev-lang/python-exec-2:=[python_targets_pypy] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
 REQUIRED_USE=tools? ( ^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RESTRICT=!test? ( test )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=975a8ad91b72f392de82f3a3607d4d18
+_md5_=ca94c71569c48b2f91bad4913dbc556f
diff --git a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1 b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
index 693e190fb01f..70fbab3361ed 100644
--- a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
+++ b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.16.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnome-keyring/3.12/libgnome-keyring-3.12.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48480914c331689271f38af6fdc17518
+_md5_=1cd81a4fcddfa0b2c1a4b96f38780189
diff --git a/metadata/md5-cache/gnome-base/libgnomekbd-3.26.1 b/metadata/md5-cache/gnome-base/libgnomekbd-3.26.1
index 606c3795d61c..e377e3099705 100644
--- a/metadata/md5-cache/gnome-base/libgnomekbd-3.26.1
+++ b/metadata/md5-cache/gnome-base/libgnomekbd-3.26.1
@@ -7,7 +7,8 @@ IUSE=+introspection test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.91.7:3[X,introspection?] >=x11-libs/libxklavier-5.2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=mirror://gnome/sources/libgnomekbd/3.26/libgnomekbd-3.26.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a5b53923383f42a46c5e3bc94359cfd
+_md5_=b71fe2fb1cfbb4fa3e857444158b2daa
diff --git a/metadata/md5-cache/gnome-base/libgnomeui-2.24.5-r1 b/metadata/md5-cache/gnome-base/libgnomeui-2.24.5-r1
index 73e38ff28301..33d8002a81c3 100644
--- a/metadata/md5-cache/gnome-base/libgnomeui-2.24.5-r1
+++ b/metadata/md5-cache/gnome-base/libgnomeui-2.24.5-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-li
 LICENSE=LGPL-2
 PDEPEND=x11-themes/adwaita-icon-theme
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.4.20:2 >=dev-libs/popt-1.5 >=gnome-base/gconf-2:2 >=gnome-base/gnome-keyring-0.4 >=gnome-base/gnome-vfs-2.7.3:2 >=gnome-base/libgnome-2.13.7 >=gnome-base/libgnomecanvas-2 gnome-base/libgnome-keyring >=gnome-base/libbonoboui-2.13.1 >=gnome-base/libglade-2:2.0 media-libs/libart_lgpl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.14:2 >=x11-libs/pango-1.1.2 x11-libs/libICE x11-libs/libSM
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnomeui/2.24/libgnomeui-2.24.5.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81c4afd01fb1926cac1e3d2d3f14e7a9
+_md5_=97d82c26a2e884cfe34f8ae6047c5c1f
diff --git a/metadata/md5-cache/gnome-base/orbit-2.14.19-r5 b/metadata/md5-cache/gnome-base/orbit-2.14.19-r5
index 7b479d8e4974..558df1e7196d 100644
--- a/metadata/md5-cache/gnome-base/orbit-2.14.19-r5
+++ b/metadata/md5-cache/gnome-base/orbit-2.14.19-r5
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2.44.1-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libIDL-0.8.14-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=test? ( debug )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3ce7a33ff2ddf64a870a403d0912113
+_md5_=90a11d1e1667a8bc282a4e1a79b0ea01
diff --git a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1
index df280b4fea6e..03b5f638d96b 100644
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1
@@ -7,7 +7,8 @@ IUSE=packagekit raw test test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-color-manager/3.30/gnome-color-manager-3.30.0.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=623a7390b36b28940c0364c8b1945152
+_md5_=57844a1651d330659be8fd6c1a02730a
diff --git a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.32.0 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.32.0
index ab1381a20845..7decf54006ab 100644
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.32.0
+++ b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.32.0
@@ -7,7 +7,8 @@ IUSE=packagekit raw test test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-color-manager/3.32/gnome-color-manager-3.32.0.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56e5827f241ee9b9d4911dca43e49ef7
+_md5_=494e64c85286748c40823698d50064c8
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.10.0 b/metadata/md5-cache/gnome-extra/gnome-commander-1.10.0
index bf898da485c4..2ad768eda122 100644
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.10.0
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.10.0
@@ -7,7 +7,8 @@ IUSE=chm exif gsf pdf taglib samba test +unique
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) taglib? ( >=media-libs/taglib-1.4 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-commander/1.10/gnome-commander-1.10.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=202a8d0f18123ae8cee7dc99f4883e07
+_md5_=01a7b9a931967f189855b607df492b55
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.10.1 b/metadata/md5-cache/gnome-extra/gnome-commander-1.10.1
index 5399f467372b..4b22299a4017 100644
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.10.1
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.10.1
@@ -7,7 +7,8 @@ IUSE=chm exif gsf pdf taglib samba test +unique
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) taglib? ( >=media-libs/taglib-1.4 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-commander/1.10/gnome-commander-1.10.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0c08a4777cf64c95e93eb13bf355f1c
+_md5_=8728c129d693597314fa6cb2930ec8e2
diff --git a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.24.0
index 980a4632578f..fa4ae44bb75c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.24.0
@@ -7,7 +7,8 @@ IUSE=systemd udev test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.9.1 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( dev-libs/libgudev:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-packagekit/3.24/gnome-packagekit-3.24.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=06eea16c51aa5d6ba837ea4fdc3d5655
+_md5_=1fa455b4610800c9cf40b693f0b9e181
diff --git a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0
index 1ae5800e4cca..6c1948db5e2b 100644
--- a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0
@@ -7,7 +7,8 @@ IUSE=systemd test test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.15.3:3 >=app-admin/packagekit-base-0.9.1 systemd? ( sys-auth/polkit >=sys-apps/systemd-42 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-packagekit/3.30/gnome-packagekit-3.30.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e1118b1f9d84d1665855430dba6027f
+_md5_=a4192093e3838d34f2a2c43d67a337d7
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0
index 8146ebbd4cec..aea7345a2022 100644
--- a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0
@@ -7,7 +7,8 @@ IUSE=test test
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= x11-themes/adwaita-icon-theme
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-power-manager/3.30/gnome-power-manager-3.30.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2acb27db8a1a6772bd750cfdb729407
+_md5_=4511fe0119eb895fd1eaafcefa8d5850
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-3.30.6 b/metadata/md5-cache/gnome-extra/gnome-software-3.30.6
index 45247a754c55..9c7791961efc 100644
--- a/metadata/md5-cache/gnome-extra/gnome-software-3.30.6
+++ b/metadata/md5-cache/gnome-extra/gnome-software-3.30.6
@@ -7,7 +7,8 @@ IUSE=+firmware gnome gtk-doc packagekit spell test udev test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/appstream-glib-0.7.14:0 >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22.4:3 >=dev-libs/json-glib-1.2.0 app-crypt/libsecret >=net-libs/libsoup-2.52.0:2.4 gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= ) spell? ( app-text/gspell:= ) sys-auth/polkit packagekit? ( >=app-admin/packagekit-base-1.1.0 ) firmware? ( >=sys-apps/fwupd-1.0.3 ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-software/3.30/gnome-software-3.30.6.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=414a4f404e3334d09e17eab8ebc16b0d
+_md5_=65a9f88ec5801075b358053d2be6d646
diff --git a/metadata/md5-cache/gnome-extra/gnome-weather-3.26.0 b/metadata/md5-cache/gnome-extra/gnome-weather-3.26.0
index 70b0a2aa8cf2..8050ef72daed 100644
--- a/metadata/md5-cache/gnome-extra/gnome-weather-3.26.0
+++ b/metadata/md5-cache/gnome-extra/gnome-weather-3.26.0
@@ -7,7 +7,8 @@ IUSE=test test
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libgweather-3.25.91:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.11.4:3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-weather/3.26/gnome-weather-3.26.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=521e5cbd7a2a20915930274c34dc3e66
+_md5_=48635e5b0cd24d75790e1960c0785ec6
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-12.0.1 b/metadata/md5-cache/gnome-extra/gucharmap-12.0.1
index d045390b2e8d..c4a6e1492797 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-12.0.1
+++ b/metadata/md5-cache/gnome-extra/gucharmap-12.0.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ia64 ppc ppc64 ~sh sparc x86
 LICENSE=GPL-3+
 RDEPEND==app-i18n/unicode-data-12.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] media-libs/freetype:2 introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/12.0/gucharmap-12.0.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca39d23d09f1e7779de93a75ecc2e8d5
+_md5_=575ceed5d5e2a2fdbb85cab106c5ef02
diff --git a/metadata/md5-cache/gnustep-base/libobjc2-1.8 b/metadata/md5-cache/gnustep-base/libobjc2-1.8
index 435284fbc5e7..d989891d6fbe 100644
--- a/metadata/md5-cache/gnustep-base/libobjc2-1.8
+++ b/metadata/md5-cache/gnustep-base/libobjc2-1.8
@@ -7,7 +7,8 @@ IUSE=boehm-gc cxx test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) cxx? ( sys-libs/libcxx )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnustep/libobjc2/archive/v1.8.tar.gz -> libobjc2-1.8.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd20671afc6bf5e7d3e7083e21d0819c
+_md5_=9d5a8721626c8ba4e4be29d7d23c7993
diff --git a/metadata/md5-cache/gnustep-base/libobjc2-1.8.1 b/metadata/md5-cache/gnustep-base/libobjc2-1.8.1
index c6effaba836c..3adf22a8d166 100644
--- a/metadata/md5-cache/gnustep-base/libobjc2-1.8.1
+++ b/metadata/md5-cache/gnustep-base/libobjc2-1.8.1
@@ -7,7 +7,8 @@ IUSE=boehm-gc cxx test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) cxx? ( sys-libs/libcxx )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnustep/libobjc2/archive/v1.8.1.tar.gz -> libobjc2-1.8.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd20671afc6bf5e7d3e7083e21d0819c
+_md5_=9d5a8721626c8ba4e4be29d7d23c7993
diff --git a/metadata/md5-cache/gnustep-base/libobjc2-2.0 b/metadata/md5-cache/gnustep-base/libobjc2-2.0
index 774e608ffcbd..344456d5b6a0 100644
--- a/metadata/md5-cache/gnustep-base/libobjc2-2.0
+++ b/metadata/md5-cache/gnustep-base/libobjc2-2.0
@@ -7,7 +7,8 @@ IUSE=boehm-gc test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) sys-libs/libcxx
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnustep/libobjc2/archive/v2.0.tar.gz -> libobjc2-2.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=783f2ee8f6ea0d98216e8f9e93b59848
+_md5_=f36990b724ee5ff20c0ec6be6a32dc2f
diff --git a/metadata/md5-cache/mail-client/alot-0.5.1 b/metadata/md5-cache/mail-client/alot-0.5.1
index ca08b1d82fb3..d30093c6c8e7 100644
--- a/metadata/md5-cache/mail-client/alot-0.5.1
+++ b/metadata/md5-cache/mail-client/alot-0.5.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-python/configobj-4.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygpgme-0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-magic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-10.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwidtrees-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-mail/mailbase >=net-mail/notmuch-0.13[crypt,python] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/tarball/0.5.1 -> alot-0.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=810481cd92f8ef604afbc6df2ec4b5a7
+_md5_=c65c9fbf136441fbaf41c4395499e897
diff --git a/metadata/md5-cache/mail-client/alot-0.6 b/metadata/md5-cache/mail-client/alot-0.6
index 93c31c65fc63..b97dd76472f1 100644
--- a/metadata/md5-cache/mail-client/alot-0.6
+++ b/metadata/md5-cache/mail-client/alot-0.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/configobj-4.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-crypt/gpgme-1.9.0[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-magic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-10.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwidtrees-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-mail/mailbase >=net-mail/notmuch-0.13[crypt,python] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/tarball/0.6 -> alot-0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b44006e17c7a60f77fa9f24e3d6997ae
+_md5_=e3fbab63e9ca2ff965cdd362e094f74d
diff --git a/metadata/md5-cache/mail-client/alot-0.7 b/metadata/md5-cache/mail-client/alot-0.7
index 23a740f49b91..38f9de9a3977 100644
--- a/metadata/md5-cache/mail-client/alot-0.7
+++ b/metadata/md5-cache/mail-client/alot-0.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/configobj-4.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-crypt/gpgme-1.9.0[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-magic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-10.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwidtrees-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-mail/mailbase >=net-mail/notmuch-0.13[crypt,python] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/tarball/0.7 -> alot-0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d255121d53f2fedbe33368e736efb177
+_md5_=e3fbab63e9ca2ff965cdd362e094f74d
diff --git a/metadata/md5-cache/mail-client/alot-0.7-r1 b/metadata/md5-cache/mail-client/alot-0.7-r1
index e6e6c87bbd07..ee33bec8408d 100644
--- a/metadata/md5-cache/mail-client/alot-0.7-r1
+++ b/metadata/md5-cache/mail-client/alot-0.7-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/configobj-4.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-crypt/gpgme-1.9.0[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-magic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwidtrees-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-mail/mailbase >=net-mail/notmuch-0.13[crypt,python] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/tarball/0.7 -> alot-0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7fb2e8af52bcf542d509cfa7ca1a77ec
+_md5_=ce3fd0f319224354473ce0b1c845fc05
diff --git a/metadata/md5-cache/mail-client/alot-0.8.1 b/metadata/md5-cache/mail-client/alot-0.8.1
index 5e8a97c8504c..7ad871d3d134 100644
--- a/metadata/md5-cache/mail-client/alot-0.8.1
+++ b/metadata/md5-cache/mail-client/alot-0.8.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-crypt/gpgme-1.9.0[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configobj-4.7.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-magic[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-1.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwidtrees-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-mail/mailbase >=net-mail/notmuch-0.27[crypt,python] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/archive/0.8.1.tar.gz -> alot-0.8.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d50b44a0bc2512e23603fb9c7bba848e
+_md5_=829844badd2a275e74d1b3fa3928048d
diff --git a/metadata/md5-cache/mail-client/trojita-0.7-r2 b/metadata/md5-cache/mail-client/trojita-0.7-r2
index 564f4821c292..e1d88be0dc8f 100644
--- a/metadata/md5-cache/mail-client/trojita-0.7-r2
+++ b/metadata/md5-cache/mail-client/trojita-0.7-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=password? ( dbus )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/trojita/trojita-0.7.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a53b4fbb103ef687bb2d5e11f1b09ff
+_md5_=67480b036b3300f7cca8b6f4b451bec6
diff --git a/metadata/md5-cache/mail-client/trojita-9999 b/metadata/md5-cache/mail-client/trojita-9999
index ef757f60b2e7..9d8fab8d3280 100644
--- a/metadata/md5-cache/mail-client/trojita-9999
+++ b/metadata/md5-cache/mail-client/trojita-9999
@@ -9,6 +9,7 @@ LICENSE=|| ( GPL-2 GPL-3 )
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) pim? ( kde-apps/akonadi-contacts:5 ) spell? ( kde-frameworks/sonnet:5 ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=password? ( dbus )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d6f27c6f2dfa5ad7e0265e07aa854bf
+_md5_=4275f3f88d701a7e422df3edc7e18201
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r16 b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r16
index 910ba35ace1d..1fc7026f585b 100644
--- a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r16
+++ b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r16
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=BSD GPL-2 Sendmail-Open-Source
 RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd sys-apps/grep ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( >=sys-libs/db-3.2:* ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua:* ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) memcached? ( dev-libs/libmemcached ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root ) !unbound? ( net-libs/ldns ) sys-process/psmisc selinux? ( sec-policy/selinux-dkim ) virtual/tmpfiles
 REQUIRED_USE=sasl? ( ldap ) stats? ( opendbx ) query_cache? ( berkdb )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendkim/opendkim-2.10.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f81a3dcf48a6f1186d5d80ace164a472
+_md5_=df58c2688087ab9d6e1477676f1101a0
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2 b/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2
index 8d579b801d57..391ca642d6a4 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2
@@ -7,7 +7,8 @@ IUSE=berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-crypt/gnupg dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.2.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0d091ce587cff1fb134f9d720d428fbf
+_md5_=bb0d64f02d3c867d8074c183f6cad0de
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r6 b/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r6
index f929ff0b7ae3..9e8fb0d0fd8e 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r6
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r6
@@ -7,7 +7,8 @@ IUSE=berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-crypt/gnupg dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.2.tar.bz2
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=42aee1ad1494be1f9e536edad39b90a0
+_md5_=6223419ece251c6304964b9f2a4e8f9e
diff --git a/metadata/md5-cache/mail-mta/nullmailer-2.0-r2 b/metadata/md5-cache/mail-mta/nullmailer-2.0-r2
index 0c0c8739fa60..271290702caa 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-2.0-r2
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.0-r2
@@ -7,7 +7,8 @@ IUSE=ssl test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/logger virtual/shadow ssl? ( net-libs/gnutls:0= ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6b7032fe445c564c34decbf7e8a998e9
+_md5_=250391566946cdad3ccbeed52eb35f5e
diff --git a/metadata/md5-cache/mail-mta/nullmailer-2.2 b/metadata/md5-cache/mail-mta/nullmailer-2.2
index 2d25f2f80915..105c481df005 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-2.2
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.2
@@ -8,7 +8,8 @@ IUSE=ssl test
 KEYWORDS=amd64 ~arm ppc x86 ~x64-cygwin
 LICENSE=GPL-2
 RDEPEND=virtual/logger virtual/shadow ssl? ( net-libs/gnutls:0= ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta(+)] !mail-mta/netqmail !mail-mta/opensmtpd[mta(+)] !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta(+)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=aefbfab5f9ceaf7759cd6d6bee55c2c3
+_md5_=be6cfd3248204319b7a2cf337b6502e1
diff --git a/metadata/md5-cache/mate-base/libmatekbd-1.18.2 b/metadata/md5-cache/mate-base/libmatekbd-1.18.2
index 7ad8b233f883..7f7e33dc048a 100644
--- a/metadata/md5-cache/mate-base/libmatekbd-1.18.2
+++ b/metadata/md5-cache/mate-base/libmatekbd-1.18.2
@@ -7,7 +7,8 @@ IUSE=X +introspection test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.36:2 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.24:2 x11-libs/libX11:0 >=x11-libs/libxklavier-5.2:0[introspection?] x11-libs/pango:0 virtual/libintl:0 >=x11-libs/gtk+-3.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/libmatekbd-1.18.2.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c7c3209c9cb1adde2fd39be21d0ed8b
+_md5_=687c380a1cb82cc76c38e5cd28b2d5d5
diff --git a/metadata/md5-cache/mate-base/libmatekbd-1.22.0 b/metadata/md5-cache/mate-base/libmatekbd-1.22.0
index af08377dd212..259f0c48c1e9 100644
--- a/metadata/md5-cache/mate-base/libmatekbd-1.22.0
+++ b/metadata/md5-cache/mate-base/libmatekbd-1.22.0
@@ -7,7 +7,8 @@ IUSE=X +introspection test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.50:2 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.24:2 x11-libs/libX11 >=x11-libs/libxklavier-5.2:0[introspection?] x11-libs/pango virtual/libintl >=x11-libs/gtk+-3.22:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.22/libmatekbd-1.22.0.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cab9936196737aa21031338d37c17d8b
+_md5_=87a9a03b8111ea5fda40cae5f11775a7
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.22.0 b/metadata/md5-cache/mate-extra/mate-utils-1.22.0
index dae420e49b69..3b6f3cb69988 100644
--- a/metadata/md5-cache/mate-extra/mate-utils-1.22.0
+++ b/metadata/md5-cache/mate-extra/mate-utils-1.22.0
@@ -7,7 +7,8 @@ IUSE=X applet debug ipv6 test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=gnome-base/libgtop-2.12:2= >=media-libs/libcanberra-0.4[gtk3] sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-utils-1.22.0.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2968e10298332ee341b93b6d03286a91
+_md5_=fce99286c8db71a389cc8b4e3cd4bb0a
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.22.1-r1 b/metadata/md5-cache/mate-extra/mate-utils-1.22.1-r1
index a1fd88ea3d72..be31763b4683 100644
--- a/metadata/md5-cache/mate-extra/mate-utils-1.22.1-r1
+++ b/metadata/md5-cache/mate-extra/mate-utils-1.22.1-r1
@@ -7,7 +7,8 @@ IUSE=X applet debug ipv6 test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=gnome-base/libgtop-2.12:2= >=media-libs/libcanberra-0.4[gtk3] sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-utils-1.22.1.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=04333652695c7dcd83756068bfa1cfa4
+_md5_=d6a590fa64a6605e15aaf52c1ca0d70c
diff --git a/metadata/md5-cache/media-gfx/alembic-1.7.11 b/metadata/md5-cache/media-gfx/alembic-1.7.11
index c95ba94157ad..d72426610805 100644
--- a/metadata/md5-cache/media-gfx/alembic-1.7.11
+++ b/metadata/md5-cache/media-gfx/alembic-1.7.11
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/openexr-2.3.0:= boost? ( >=dev-libs/boost-1.65.0:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] ) python? ( >=dev-python/pyilmbase-2.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) hdf5? ( zlib ) python? ( boost )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alembic/alembic/archive/1.7.11.tar.gz -> alembic-1.7.11.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5ce5902b768b51a786657a0cd873f90
+_md5_=96de28a5d6a29dd039b6f0ff0089ff21
diff --git a/metadata/md5-cache/media-gfx/alembic-1.7.9 b/metadata/md5-cache/media-gfx/alembic-1.7.9
index 10284e767eb2..ad4fd2fc0090 100644
--- a/metadata/md5-cache/media-gfx/alembic-1.7.9
+++ b/metadata/md5-cache/media-gfx/alembic-1.7.9
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/openexr-2.2.0-r2:= boost? ( >=dev-libs/boost-1.65.0:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] ) python? ( >=dev-python/pyilmbase-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) hdf5? ( zlib ) python? ( boost )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alembic/alembic/archive/1.7.9.tar.gz -> alembic-1.7.9.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88d603fd5e0d3c47ace12d8859faa00d
+_md5_=0b698c0f14d90406a4639206e24b109f
diff --git a/metadata/md5-cache/media-gfx/curaengine-3.4.1 b/metadata/md5-cache/media-gfx/curaengine-3.4.1
index 98dfcdcdc958..190a43768f9e 100644
--- a/metadata/md5-cache/media-gfx/curaengine-3.4.1
+++ b/metadata/md5-cache/media-gfx/curaengine-3.4.1
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=~dev-libs/libarcus-3.4.1:* dev-libs/protobuf dev-libs/stb
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/3.4.1.tar.gz -> curaengine-3.4.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d154bfc0f0c2e3e859b1312c1a706030
+_md5_=55d767d882b07b947888b36486dbbeee
diff --git a/metadata/md5-cache/media-gfx/curaengine-3.6.0 b/metadata/md5-cache/media-gfx/curaengine-3.6.0
index 3ea74310c245..7440cc280d9d 100644
--- a/metadata/md5-cache/media-gfx/curaengine-3.6.0
+++ b/metadata/md5-cache/media-gfx/curaengine-3.6.0
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=~dev-libs/libarcus-3.6.0:* dev-libs/protobuf dev-libs/stb
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/3.6.0.tar.gz -> curaengine-3.6.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d154bfc0f0c2e3e859b1312c1a706030
+_md5_=55d767d882b07b947888b36486dbbeee
diff --git a/metadata/md5-cache/media-gfx/curaengine-4.2.0 b/metadata/md5-cache/media-gfx/curaengine-4.2.0
index 5ed38e852d36..daac0256a743 100644
--- a/metadata/md5-cache/media-gfx/curaengine-4.2.0
+++ b/metadata/md5-cache/media-gfx/curaengine-4.2.0
@@ -8,7 +8,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=~dev-libs/libarcus-4.2.0:* dev-libs/protobuf dev-libs/stb
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/4.2.0.tar.gz -> curaengine-4.2.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=98329be862a40369a4811d336ecd380d
+_md5_=e7514278e6fc874d669fb890803750a2
diff --git a/metadata/md5-cache/media-gfx/curaengine-4.3.0 b/metadata/md5-cache/media-gfx/curaengine-4.3.0
index dde48be9c6f2..f2bfccd84f83 100644
--- a/metadata/md5-cache/media-gfx/curaengine-4.3.0
+++ b/metadata/md5-cache/media-gfx/curaengine-4.3.0
@@ -8,7 +8,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=~dev-libs/libarcus-4.3.0:* dev-libs/protobuf dev-libs/stb
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/4.3.0.tar.gz -> curaengine-4.3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3291572154553de9dd8e9a7113b456fe
+_md5_=f4f0481a781c44b947330b8f9917ebac
diff --git a/metadata/md5-cache/media-gfx/gnome-photos-3.30.1-r1 b/metadata/md5-cache/media-gfx/gnome-photos-3.30.1-r1
index 6eff700cdcd7..ab4f93723627 100644
--- a/metadata/md5-cache/media-gfx/gnome-photos-3.30.1-r1
+++ b/metadata/md5-cache/media-gfx/gnome-photos-3.30.1-r1
@@ -7,7 +7,8 @@ IUSE=flickr test upnp-av test
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3+ LGPL-2+ CC0-1.0
 RDEPEND=>=app-misc/tracker-2.0:0/2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libdazzle-3.26.0 gnome-base/gsettings-desktop-schemas >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts] media-libs/babl >=media-libs/gegl-0.4.0:0.4[cairo,raw] >=media-libs/gexiv2-0.10.8 >=media-libs/grilo-0.3.5:0.3= >=media-libs/libpng-1.6:0= >=net-libs/gnome-online-accounts-3.8:= >=net-libs/libgfbgraph-0.2.1:0.2 sci-geosciences/geocode-glib >=x11-libs/cairo-1.14 >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/gtk+-3.22.16:3 virtual/jpeg:0 net-misc/gnome-online-miners[flickr?] upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) >=app-misc/tracker-miners-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-photos/3.30/gnome-photos-3.30.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e38823f7933f33e490986a7e876f31f
+_md5_=5d4f55daf1585050ac30a52e09e0c75d
diff --git a/metadata/md5-cache/media-gfx/gnome-photos-3.32.1 b/metadata/md5-cache/media-gfx/gnome-photos-3.32.1
index af12a5e7672f..67a504a8e96f 100644
--- a/metadata/md5-cache/media-gfx/gnome-photos-3.32.1
+++ b/metadata/md5-cache/media-gfx/gnome-photos-3.32.1
@@ -8,7 +8,8 @@ IUSE=flickr test upnp-av test
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3+ LGPL-2+ CC0-1.0
 RDEPEND=media-libs/babl >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36.8:2 >=media-libs/gegl-0.4.0:0.4[cairo,raw] sci-geosciences/geocode-glib >=media-libs/gexiv2-0.10.8 >=dev-libs/glib-2.57.2:2 >=net-libs/gnome-online-accounts-3.8.0:= >=media-libs/grilo-0.3.5:0.3= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.16:3 >=dev-libs/libdazzle-3.26.0 >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts] >=net-libs/libgfbgraph-0.2.1:0.2 virtual/jpeg:0 >=media-libs/libpng-1.6:0= >=app-misc/tracker-2.0:0/2.0 sys-apps/dbus net-misc/gnome-online-miners[flickr?] upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) >=app-misc/tracker-miners-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-photos/3.32/gnome-photos-3.32.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b85bfc8dac3754128b9e89fa8bd1e9b4
+_md5_=6799718c9e9c7e1294a53b3daa2ab013
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.10 b/metadata/md5-cache/media-gfx/graphite2-1.3.10
index 6e12b1ef8ba3..e8f22df07993 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.3.10
+++ b/metadata/md5-cache/media-gfx/graphite2-1.3.10
@@ -7,7 +7,8 @@ IUSE=perl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_m
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.3.10.tgz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36c097ed6e47fca3f064379225b92bb0
+_md5_=2033ddc8bd9828bc20f443199ac69a3a
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.13 b/metadata/md5-cache/media-gfx/graphite2-1.3.13
index c3ef0373665c..7d5c82687668 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.3.13
+++ b/metadata/md5-cache/media-gfx/graphite2-1.3.13
@@ -8,7 +8,8 @@ IUSE=perl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_m
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.3.13.tgz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=777b6244ead9c75229465d53e7868715
+_md5_=673c87140866cc0d0ca8929a5e04a983
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.6.2-r1 b/metadata/md5-cache/media-gfx/gthumb-3.6.2-r1
index 948b1e990554..b4be5734844c 100644
--- a/metadata/md5-cache/media-gfx/gthumb-3.6.2-r1
+++ b/metadata/md5-cache/media-gfx/gthumb-3.6.2-r1
@@ -7,7 +7,8 @@ IUSE=cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slide
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36.0:2[dbus] >=x11-libs/gtk+-3.16.0:3 exif? ( >=media-gfx/exiv2-0.21:= ) slideshow? ( >=media-libs/clutter-1.12.0:1.0 >=media-libs/clutter-gtk-1:1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-gtk:1.0 ) raw? ( >=media-libs/libraw-0.14:= ) http? ( >=net-libs/libsoup-2.42.0:2.4 ) gnome-keyring? ( >=app-crypt/libsecret-0.11 ) cdr? ( >=app-cdr/brasero-3.2 ) svg? ( >=gnome-base/librsvg-2.34:2 ) webp? ( >=media-libs/libwebp-0.2.0 ) json? ( >=dev-libs/json-glib-0.15.0 ) webkit? ( >=net-libs/webkit-gtk-1.10.0:4 ) lcms? ( >=media-libs/lcms-2.6:2 ) colord? ( >=x11-misc/colord-1.3 >=media-libs/lcms-2.6:2 ) media-libs/libpng:0= sys-libs/zlib >=gnome-base/gsettings-desktop-schemas-0.1.4 jpeg? ( virtual/jpeg:0= ) tiff? ( media-libs/tiff:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gthumb/3.6/gthumb-3.6.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4fa4f11e4483c111a0471ff1d05d8220
+_md5_=ee686db4bb33f14ecb52007b3dcc86a8
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.3.1 b/metadata/md5-cache/media-gfx/img2pdf-0.3.1
index c351c5105b84..e2071d11ee92 100644
--- a/metadata/md5-cache/media-gfx/img2pdf-0.3.1
+++ b/metadata/md5-cache/media-gfx/img2pdf-0.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/img2pdf/img2pdf-0.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33abf2e75a78109f33931e22eaa1a7d4
+_md5_=af5a6ce622cb358b7ea168ff37c092cf
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.3.3 b/metadata/md5-cache/media-gfx/img2pdf-0.3.3
index 7321a568599e..78aa2fd362a1 100644
--- a/metadata/md5-cache/media-gfx/img2pdf-0.3.3
+++ b/metadata/md5-cache/media-gfx/img2pdf-0.3.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/img2pdf/img2pdf-0.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b776cfa872a75de4d9347b384e9d810
+_md5_=620ab850c515ebf43f14c379762a0e38
diff --git a/metadata/md5-cache/media-gfx/imv-2.1.3 b/metadata/md5-cache/media-gfx/imv-2.1.3
index 74f4616ab5d6..401d931831f7 100644
--- a/metadata/md5-cache/media-gfx/imv-2.1.3
+++ b/metadata/md5-cache/media-gfx/imv-2.1.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=!sys-apps/renameutils media-libs/fontconfig media-libs/libsdl2 media-libs/sdl2-ttf media-libs/freeimage
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eXeC64/imv/archive/v2.1.3.tar.gz -> imv-2.1.3.tar.gz
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f42c694c024332986bf8c90a527fdce1
+_md5_=a198dd5bdd5c1870af469ac0a3a1065f
diff --git a/metadata/md5-cache/media-gfx/imv-9999 b/metadata/md5-cache/media-gfx/imv-9999
index 2fb574fc8236..78f9708575ed 100644
--- a/metadata/md5-cache/media-gfx/imv-9999
+++ b/metadata/md5-cache/media-gfx/imv-9999
@@ -7,6 +7,7 @@ IUSE=test
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=!sys-apps/renameutils media-libs/fontconfig media-libs/libsdl2 media-libs/sdl2-ttf media-libs/freeimage
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7d3d7859aeac6d9af299dd9a388b092
+_md5_=6654e6d47ff4b594aceaff37ed9df267
diff --git a/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0 b/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0
index 22e1defc0ba3..3475a691fddf 100644
--- a/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0
+++ b/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0
@@ -8,7 +8,8 @@ IUSE=cpu_flags_x86_sse2 fits openmp test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/ilmbase:= media-libs/lcms:2 media-libs/libpng:0= media-libs/libraw:= media-libs/openexr:= media-libs/tiff:0 sci-libs/fftw:3.0=[threads] sci-libs/gsl:= virtual/jpeg:0 fits? ( sci-libs/cfitsio:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/qtpfsgui/luminance-hdr-2.6.0.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c41c2eba13ed5d36146abee96e84b7f
+_md5_=b21366f0a39bd2797b2564bbc79dc590
diff --git a/metadata/md5-cache/media-gfx/openmesh-7.1 b/metadata/md5-cache/media-gfx/openmesh-7.1
index be6d602851f4..2ea91f681e2f 100644
--- a/metadata/md5-cache/media-gfx/openmesh-7.1
+++ b/metadata/md5-cache/media-gfx/openmesh-7.1
@@ -7,7 +7,8 @@ IUSE=qt5 static-libs test
 KEYWORDS=~amd64 ~ia64 ~x86
 LICENSE=BSD
 RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/freeglut )
+RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://openmesh.org/media/Releases/7.1/OpenMesh-7.1.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ae31aafe41270ef1d269343a3d229ff
+_md5_=c3556d954100f21e3c512bbfd25e0987
diff --git a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2 b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2
index 39552581226a..9d434bbee2b6 100644
--- a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2
+++ b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-libs/boost-1.62:=[python?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dreamworksanimation/openvdb/archive/v4.0.2.tar.gz -> openvdb-4.0.2.tar.gz https://dev.gentoo.org/~dracwyrm/patches/openvdb-4.0.2-patchset-02.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c043c8ae7dcff5eecae031ddd7748522
+_md5_=29af3d880c2a5f7bf9e1cf99952dc4a7
diff --git a/metadata/md5-cache/media-gfx/openvdb-5.2.0 b/metadata/md5-cache/media-gfx/openvdb-5.2.0
index 171f62df024b..9193a23b0b7d 100644
--- a/metadata/md5-cache/media-gfx/openvdb-5.2.0
+++ b/metadata/md5-cache/media-gfx/openvdb-5.2.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-libs/boost-1.62:=[python?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dreamworksanimation/openvdb/archive/v5.2.0.tar.gz -> openvdb-5.2.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2d021c7f8ac1f20365d5b149190c6c5
+_md5_=35b21461124b5851e18d982093b58463
diff --git a/metadata/md5-cache/media-gfx/qrencode-4.0.2 b/metadata/md5-cache/media-gfx/qrencode-4.0.2
index 9ec9cff0186b..760c115da37b 100644
--- a/metadata/md5-cache/media-gfx/qrencode-4.0.2
+++ b/metadata/md5-cache/media-gfx/qrencode-4.0.2
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2
 RDEPEND=media-libs/libpng:0=
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://fukuchi.org/works/qrencode/qrencode-4.0.2.tar.bz2
-_md5_=ef3e77d3c8f6daed7402d762b09b69d0
+_md5_=491eafd28b1616d5143681f147fd639f
diff --git a/metadata/md5-cache/media-gfx/sigal-1.3.0 b/metadata/md5-cache/media-gfx/sigal-1.3.0
index c7e5f8411f9e..4bd455c3e970 100644
--- a/metadata/md5-cache/media-gfx/sigal-1.3.0
+++ b/metadata/md5-cache/media-gfx/sigal-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pilkit[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saimn/sigal/archive/1.3.0.tar.gz -> sigal-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=694fdb65da5fe1d48827a4c085cd89ce
+_md5_=578ea65dc3744224875f929dc6139f22
diff --git a/metadata/md5-cache/media-gfx/slic3r-1.1.7 b/metadata/md5-cache/media-gfx/slic3r-1.1.7
index 7d4ec1e889fa..11624db16d7c 100644
--- a/metadata/md5-cache/media-gfx/slic3r-1.1.7
+++ b/metadata/md5-cache/media-gfx/slic3r-1.1.7
@@ -7,7 +7,8 @@ IUSE=+gui test
 KEYWORDS=amd64 x86
 LICENSE=AGPL-3 CC-BY-3.0
 RDEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAccessor dev-perl/Encode-Locale dev-perl/IO-stringy >=dev-perl/Math-PlanePath-53.0.0 >=dev-perl/Moo-1.3.1 dev-perl/XML-SAX-ExpatXS virtual/perl-Carp virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-parent virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple virtual/perl-Thread-Semaphore >=virtual/perl-threads-1.960.0 virtual/perl-Time-HiRes virtual/perl-XSLoader gui? ( dev-perl/Class-Accessor dev-perl/Growl-GNTP dev-perl/libwww-perl dev-perl/Module-Pluggable dev-perl/Net-Bonjour dev-perl/Net-DBus dev-perl/OpenGL >=dev-perl/Wx-0.991.800 dev-perl/Wx-GLCanvas >=media-libs/freeglut-3 virtual/perl-Math-Complex >=virtual/perl-Socket-2.16.0 x11-libs/libXmu ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alexrj/slic3r/archive/1.1.7.tar.gz -> slic3r-1.1.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dce63a4a7b5fbfb169f208d713b07cd4
+_md5_=d4d5453418a712e7ac1a66982bddc1b1
diff --git a/metadata/md5-cache/media-gfx/slic3r-1.3.0-r1 b/metadata/md5-cache/media-gfx/slic3r-1.3.0-r1
index 2a59d1695cc6..ae281af75852 100644
--- a/metadata/md5-cache/media-gfx/slic3r-1.3.0-r1
+++ b/metadata/md5-cache/media-gfx/slic3r-1.3.0-r1
@@ -7,7 +7,8 @@ IUSE=+gui test
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3 CC-BY-3.0
 RDEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib dev-perl/Devel-Size >=dev-perl/Encode-Locale-1.50.0 dev-perl/IO-stringy >=dev-perl/Math-PlanePath-53.0.0 >=dev-perl/Moo-1.3.1 dev-perl/XML-SAX-ExpatXS virtual/perl-Carp virtual/perl-Encode virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-parent virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple virtual/perl-Thread-Semaphore >=virtual/perl-threads-1.960.0 virtual/perl-Time-HiRes virtual/perl-Unicode-Normalize virtual/perl-XSLoader gui? ( dev-perl/Class-Accessor dev-perl/Growl-GNTP dev-perl/libwww-perl dev-perl/Module-Pluggable dev-perl/Net-Bonjour dev-perl/Net-DBus dev-perl/OpenGL >=dev-perl/Wx-0.991.800 dev-perl/Wx-GLCanvas >=media-libs/freeglut-3 virtual/perl-Math-Complex >=virtual/perl-Socket-2.16.0 x11-libs/libXmu ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alexrj/slic3r/archive/1.3.0.tar.gz -> slic3r-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e1ab802eba82a6e265ca7ff41fdab274
+_md5_=8315e012eb9a17f19d2ac30f5ae26d20
diff --git a/metadata/md5-cache/media-gfx/slic3r-9999 b/metadata/md5-cache/media-gfx/slic3r-9999
index f06cac041391..d86d474a87fc 100644
--- a/metadata/md5-cache/media-gfx/slic3r-9999
+++ b/metadata/md5-cache/media-gfx/slic3r-9999
@@ -7,6 +7,7 @@ IUSE=+gui test
 LICENSE=AGPL-3 CC-BY-3.0
 PROPERTIES=live
 RDEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib dev-perl/Devel-Size >=dev-perl/Encode-Locale-1.50.0 dev-perl/IO-stringy >=dev-perl/Math-PlanePath-53.0.0 >=dev-perl/Moo-1.3.1 dev-perl/XML-SAX-ExpatXS virtual/perl-Carp virtual/perl-Encode virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-parent virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple virtual/perl-Thread-Semaphore >=virtual/perl-threads-1.960.0 virtual/perl-Time-HiRes virtual/perl-Unicode-Normalize virtual/perl-XSLoader gui? ( dev-perl/Class-Accessor dev-perl/Growl-GNTP dev-perl/libwww-perl dev-perl/Module-Pluggable dev-perl/Net-Bonjour dev-perl/Net-DBus dev-perl/OpenGL >=dev-perl/Wx-0.991.800 dev-perl/Wx-GLCanvas >=media-libs/freeglut-3 virtual/perl-Math-Complex >=virtual/perl-Socket-2.16.0 x11-libs/libXmu ) dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7dba6a130a8d1fa9222521a5f1aac21
+_md5_=d6ec2bcc0ec58461325fdb925fa34f3e
diff --git a/metadata/md5-cache/media-gfx/zbar-0.20.1-r1 b/metadata/md5-cache/media-gfx/zbar-0.20.1-r1
index aaa1816eac38..6cf3d0d58a4b 100644
--- a/metadata/md5-cache/media-gfx/zbar-0.20.1-r1
+++ b/metadata/md5-cache/media-gfx/zbar-0.20.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
 RDEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l:0= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) test? ( X ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/zbar/zbar-0.20.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=647ae0a90bc9f028b3ab122cb22399dc
+_md5_=4177a848fa373436c771fc20c84c78cd
diff --git a/metadata/md5-cache/media-libs/allegro-4.4.2-r2 b/metadata/md5-cache/media-libs/allegro-4.4.2-r2
index 62d87fe50ca5..759dcba4a40e 100644
--- a/metadata/md5-cache/media-libs/allegro-4.4.2-r2
+++ b/metadata/md5-cache/media-libs/allegro-4.4.2-r2
@@ -7,7 +7,8 @@ IUSE=alsa fbcon jack jpeg opengl oss png svga test vga vorbis X
 KEYWORDS=amd64 ~arm64 ~mips ppc ppc64 x86
 LICENSE=Allegro MIT GPL-2+ ZLIB
 RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) svga? ( media-libs/svgalib ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/glu virtual/opengl ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/alleg/allegro-4.4.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=291ddb5323b20bb2f50cf838284f8455
+_md5_=5cf4f04f59b20b5045394468cf8b57ba
diff --git a/metadata/md5-cache/media-libs/allegro-5.2.5.0 b/metadata/md5-cache/media-libs/allegro-5.2.5.0
index 3d09e2180742..91ea0d363d90 100644
--- a/metadata/md5-cache/media-libs/allegro-5.2.5.0
+++ b/metadata/md5-cache/media-libs/allegro-5.2.5.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dumb? ( >=media-libs/dumb-0.9.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flac? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) physfs? ( >=dev-games/physfs-2.0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.5.18:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=X? ( opengl ) xinerama? ( X ) || ( alsa openal oss pulseaudio )
+RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://github.com/liballeg/allegro5/releases/download/5.2.5.0/allegro-5.2.5.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=210a1cb438689ccaa8aa4287e53be720
+_md5_=6b749d12c931c6c5cf7c595ac4e89404
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.7 b/metadata/md5-cache/media-libs/aubio-0.4.7
index 1c7c91d14fb7..4885e6e114d3 100644
--- a/metadata/md5-cache/media-libs/aubio-0.4.7
+++ b/metadata/md5-cache/media-libs/aubio-0.4.7
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~ppc ppc64 sparc x86
 LICENSE=GPL-3
 RDEPEND=ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video/libav-9:0= ) ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sndfile? ( media-libs/libsndfile )
 REQUIRED_USE=|| ( python_targets_python2_7 ) ?? ( double-precision libsamplerate )
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://aubio.org/pub/aubio-0.4.7.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3162370198f08353c9344dcd2041bb24
+_md5_=b7893a66d14f5879f5850e81d0a2d41f
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.8 b/metadata/md5-cache/media-libs/aubio-0.4.8
index 3ce6da57b8d8..2361da861cae 100644
--- a/metadata/md5-cache/media-libs/aubio-0.4.8
+++ b/metadata/md5-cache/media-libs/aubio-0.4.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video/libav-9:0= ) ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) sndfile? ( media-libs/libsndfile )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ?? ( double-precision libsamplerate )
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://aubio.org/pub/aubio-0.4.8.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4b30e51f274578fe6ab101752200f13a
+_md5_=5c69fc58199d2794aa460498080339cc
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.9 b/metadata/md5-cache/media-libs/aubio-0.4.9
index 74694b8d15b1..04f2656d3a8c 100644
--- a/metadata/md5-cache/media-libs/aubio-0.4.9
+++ b/metadata/md5-cache/media-libs/aubio-0.4.9
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video/libav-9:0= ) ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) sndfile? ( media-libs/libsndfile )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ?? ( double-precision libsamplerate )
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://aubio.org/pub/aubio-0.4.9.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad9c5134d413995cfd6e21dbf8b99e22
+_md5_=92a950cc89b36a4d01be1b54c9f06f39
diff --git a/metadata/md5-cache/media-libs/audiofile-0.3.6-r3 b/metadata/md5-cache/media-libs/audiofile-0.3.6-r3
index c0e7f3034003..d52e306eda8a 100644
--- a/metadata/md5-cache/media-libs/audiofile-0.3.6-r3
+++ b/metadata/md5-cache/media-libs/audiofile-0.3.6-r3
@@ -7,7 +7,8 @@ IUSE=flac static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mi
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=flac? ( >=media-libs/flac-1.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/audiofile/0.3/audiofile-0.3.6.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=096b183c3bfed3c828a1ac3553203d10
+_md5_=5fe657ca2abf08cc9b5f28100c12a729
diff --git a/metadata/md5-cache/media-libs/chromaprint-1.4.3 b/metadata/md5-cache/media-libs/chromaprint-1.4.3
index f951ecb25776..cb6b90db773d 100644
--- a/metadata/md5-cache/media-libs/chromaprint-1.4.3
+++ b/metadata/md5-cache/media-libs/chromaprint-1.4.3
@@ -8,7 +8,8 @@ IUSE=libav test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n6
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=libav? ( >=media-video/libav-11:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libav? ( >=media-video/ffmpeg-2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/acoustid/chromaprint/releases/download/v1.4.3/chromaprint-1.4.3.tar.gz test? ( https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz )
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a9af1feed0c71c4cadf06c737fe78b85
+_md5_=4b89c60fdb61cd861d960a94262a3c73
diff --git a/metadata/md5-cache/media-libs/clutter-1.26.2-r1 b/metadata/md5-cache/media-libs/clutter-1.26.2-r1
index 1d926720875b..aa768b5f8f1d 100644
--- a/metadata/md5-cache/media-libs/clutter-1.26.2-r1
+++ b/metadata/md5-cache/media-libs/clutter-1.26.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/atk-2.5.3[introspection?] >=dev-libs/json-glib-0.12[introspection?] >=media-libs/cogl-1.21.2:1.0=[introspection?,pango,wayland?] >=x11-libs/cairo-1.14:=[aqua?,glib] >=x11-libs/pango-1.30[introspection?] virtual/opengl x11-libs/libdrm:= egl? ( >=dev-libs/libinput-0.19.0 media-libs/cogl[gles2,kms] >=dev-libs/libgudev-136 x11-libs/libxkbcommon ) gtk? ( >=x11-libs/gtk+-3.22.6:3[aqua?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) X? ( media-libs/fontconfig >=x11-libs/libX11-1.3.1 x11-libs/libXext x11-libs/libXdamage >=x11-libs/libXi-1.3 >=x11-libs/libXcomposite-0.4 ) wayland? ( dev-libs/wayland x11-libs/gdk-pixbuf:2 )
 REQUIRED_USE=|| ( aqua wayland X ) wayland? ( egl )
+RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=mirror://gnome/sources/clutter/1.26/clutter-1.26.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03d29edf2448dd6a6cedb3f4094967e4
+_md5_=a051ec6e373c9b1a219fdb6e420b973d
diff --git a/metadata/md5-cache/media-libs/exempi-2.4.5-r1 b/metadata/md5-cache/media-libs/exempi-2.4.5-r1
index 2f380c7e5b72..c44fd0946a12 100644
--- a/metadata/md5-cache/media-libs/exempi-2.4.5-r1
+++ b/metadata/md5-cache/media-libs/exempi-2.4.5-r1
@@ -8,7 +8,8 @@ IUSE=examples static-libs test
 KEYWORDS=alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv
+RESTRICT=!test? ( test )
 SLOT=2/3
 SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.4.5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1390bae3240e008fa8cc3fc539d23b93
+_md5_=159431e0a7229a8b2e69122716e20128
diff --git a/metadata/md5-cache/media-libs/gd-2.2.5-r2 b/metadata/md5-cache/media-libs/gd-2.2.5-r2
index 3354bf40a9db..00e6068a1070 100644
--- a/metadata/md5-cache/media-libs/gd-2.2.5-r2
+++ b/metadata/md5-cache/media-libs/gd-2.2.5-r2
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=gd IJG HPND BSD
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=prefix? ( fontconfig )
+RESTRICT=!test? ( test )
 SLOT=2/3
 SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.2.5/libgd-2.2.5.tar.xz test? ( https://github.com/libgd/libgd/raw/e0cb1b76c305db68b251fe782faa12da5d357593/tests/gif/ossfuzz5700.gif -> libgd-2.2.5-ossfuzz5700.dat https://github.com/libgd/libgd/raw/e0cb1b76c305db68b251fe782faa12da5d357593/tests/gif/php_bug_75571.gif -> libgd-2.2.5-php_bug_75571.dat )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=59cb0afb2b645a495a24c814d40e3293
+_md5_=e2bb5ee2df459b14d97810777b039e75
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.0 b/metadata/md5-cache/media-libs/gegl-0.3.0
index 50ae91466087..fc893149943b 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.0
+++ b/metadata/md5-cache/media-libs/gegl-0.3.0
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linu
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp )
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a1d0f64af121a1f7becee97d2fda3e8
+_md5_=8bf991a967334e0ee17ef1550d2c1905
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.34 b/metadata/md5-cache/media-libs/gegl-0.3.34
index 1e3e959bb33f..86ea1e4d60d5 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.34
+++ b/metadata/md5-cache/media-libs/gegl-0.3.34
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linu
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.46 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.34.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7143fd173347deb50c81a1f88ad3b7d6
+_md5_=91a722df9ab834b8f347611332387739
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.14 b/metadata/md5-cache/media-libs/gegl-0.4.14
index 096b34ba37b5..de39a1c280ab 100644
--- a/metadata/md5-cache/media-libs/gegl-0.4.14
+++ b/metadata/md5-cache/media-libs/gegl-0.4.14
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64
 LICENSE=|| ( GPL-3+ LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0.4
 SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.14.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de8129184aaa8518af150d5aeb6bf2f2
+_md5_=61eaef8eb16d0eb1982e180c79aa08be
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.16 b/metadata/md5-cache/media-libs/gegl-0.4.16
index 699fe30c79b8..86bdc5c90e6a 100644
--- a/metadata/md5-cache/media-libs/gegl-0.4.16
+++ b/metadata/md5-cache/media-libs/gegl-0.4.16
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-
 LICENSE=|| ( GPL-3+ LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0.4
 SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.16.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a15097ad06e7e9651f11a6f3a3575b04
+_md5_=ff845e380c7276281efafeffb5725274
diff --git a/metadata/md5-cache/media-libs/gnonlin-1.4.0-r1 b/metadata/md5-cache/media-libs/gnonlin-1.4.0-r1
index 468550870c36..8a70ff3033c2 100644
--- a/metadata/md5-cache/media-libs/gnonlin-1.4.0-r1
+++ b/metadata/md5-cache/media-libs/gnonlin-1.4.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-base-1.4.0:1.0
+RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gnonlin/gnonlin-1.4.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fff2b1a7f2ccd5e9d106484bd1579900
+_md5_=ff3ac0862ac8d319c5db4da66858e144
diff --git a/metadata/md5-cache/media-libs/graphene-1.8.6 b/metadata/md5-cache/media-libs/graphene-1.8.6
index 81b66eb306ba..fe9f178facd9 100644
--- a/metadata/md5-cache/media-libs/graphene-1.8.6
+++ b/metadata/md5-cache/media-libs/graphene-1.8.6
@@ -8,7 +8,8 @@ IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test abi_x86_32 ab
 KEYWORDS=amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ebassi/graphene/releases/download/1.8.6/graphene-1.8.6.tar.xz
 _eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2c498974e84af5c927f31f6ee6a6d62
+_md5_=e30e1d842f5ef2d39c3aa60633271bcc
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2 b/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2
index 4b072fe281ec..d6126629790f 100644
--- a/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2
@@ -7,7 +7,8 @@ IUSE=examples +introspection static-libs test abi_x86_32 abi_x86_64 abi_x86_x32
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.2:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.2:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-srtp-1.14.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.14.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c0a40b3096d11ea627435d62f19958c5
+_md5_=8e5e967fb0166ee299e3ee20906c285e
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.5 b/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.5
index 8cc9ab88e106..d763eff169fa 100644
--- a/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.5
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.5
@@ -7,7 +7,8 @@ IUSE=examples +introspection static-libs test abi_x86_32 abi_x86_64 abi_x86_x32
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-srtp-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.14.5.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c0a40b3096d11ea627435d62f19958c5
+_md5_=8e5e967fb0166ee299e3ee20906c285e
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.14.4 b/metadata/md5-cache/media-libs/gstreamer-1.14.4
index cafd4e46ecaa..6ad0478b8bd5 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.14.4
+++ b/metadata/md5-cache/media-libs/gstreamer-1.14.4
@@ -7,7 +7,8 @@ IUSE=+caps +introspection nls +orc test unwind abi_x86_32 abi_x86_64 abi_x86_x32
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0
+RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.14.4.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bb01dca21b933b8c534e55abfabdfe23
+_md5_=4d3ea464cd04e7b9e6d72eafdc1f55ae
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.14.5 b/metadata/md5-cache/media-libs/gstreamer-1.14.5
index 7b99f7d6e9ed..18edbfe935da 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.14.5
+++ b/metadata/md5-cache/media-libs/gstreamer-1.14.5
@@ -7,7 +7,8 @@ IUSE=+caps +introspection nls +orc test unwind abi_x86_32 abi_x86_64 abi_x86_x32
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0
+RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.14.5.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=47e5741d4ca01df0d66a5361ac1eb9a5
+_md5_=93dc803555976d78d0b917bfb2afefb7
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.6.1 b/metadata/md5-cache/media-libs/harfbuzz-2.6.1
index c3aa6d12fe82..9527b872b273 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.6.1
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.6.1
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.1.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e484a32ec2ce360d114338cdebce9c5
+_md5_=0b67e8c85937c2982f3ab7a46b2a60e9
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.6.4 b/metadata/md5-cache/media-libs/harfbuzz-2.6.4
index 0d96e90aedd4..cff557cc03c7 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.6.4
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.6.4
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.4.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f2ebb0b2943f710038fd08a3959ba3b
+_md5_=cb6d693f8d46322f484c8a5ce6c8f754
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index 715f5ee2c4e8..51381c81147e 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -9,6 +9,7 @@ LICENSE=Old-MIT ISC icu
 PROPERTIES=live
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62b9345c2dd3b4a35a665987c29416fa
+_md5_=61079ab8973fa50be6ec565f51db5584
diff --git a/metadata/md5-cache/media-libs/jbig2dec-0.17-r1 b/metadata/md5-cache/media-libs/jbig2dec-0.17-r1
index f3183d263adb..a3c9ec53eb8d 100644
--- a/metadata/md5-cache/media-libs/jbig2dec-0.17-r1
+++ b/metadata/md5-cache/media-libs/jbig2dec-0.17-r1
@@ -8,7 +8,8 @@ IUSE=png static-libs test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=AGPL-3
 RDEPEND=png? ( media-libs/libpng:0= )
+RESTRICT=!test? ( test )
 SLOT=0/0.17
 SRC_URI=https://github.com/ArtifexSoftware/jbig2dec/archive/0.17.tar.gz -> jbig2dec-0.17.tar.gz test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=53b82fe725f93b5b841ea0a4e9e1c2fa
+_md5_=f89a2dc2144a59d6ad20284ee68a2638
diff --git a/metadata/md5-cache/media-libs/lcms-2.9 b/metadata/md5-cache/media-libs/lcms-2.9
index 86dfdca324f7..0359784beb98 100644
--- a/metadata/md5-cache/media-libs/lcms-2.9
+++ b/metadata/md5-cache/media-libs/lcms-2.9
@@ -7,7 +7,8 @@ IUSE=doc jpeg static-libs test +threads tiff abi_x86_32 abi_x86_64 abi_x86_x32 a
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://sourceforge/lcms/lcms2-2.9.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3f2378045b37a633869d7b37817feec9
+_md5_=6a6b1ee7619acb4dd0fa82191210a3d8
diff --git a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1 b/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
index f445e950f625..7b324b45449c 100644
--- a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
+++ b/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a
 LICENSE=LGPL-3 CC-BY-SA-3.0
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.40 media-libs/libpng:0= sys-libs/zlib:=
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lensfun/lensfun/archive/v0.3.2.tar.gz -> lensfun-0.3.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa3c90cc75a8eee8b294c60da67c5f63
+_md5_=328d7e0334e684996950d40c460cd2a7
diff --git a/metadata/md5-cache/media-libs/leptonica-1.74.4 b/metadata/md5-cache/media-libs/leptonica-1.74.4
index ff3908b206bf..60ff833fd74e 100644
--- a/metadata/md5-cache/media-libs/leptonica-1.74.4
+++ b/metadata/md5-cache/media-libs/leptonica-1.74.4
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos
 LICENSE=Apache-2.0
 RDEPEND=gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( jpeg png tiff zlib )
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/DanBloomberg/leptonica/releases/download/1.74.4/leptonica-1.74.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a09d48664150512c5ed1626eefa0438
+_md5_=483274c41241a264136b1a00765db273
diff --git a/metadata/md5-cache/media-libs/leptonica-1.77.0 b/metadata/md5-cache/media-libs/leptonica-1.77.0
index b12984370dde..414bcfa138de 100644
--- a/metadata/md5-cache/media-libs/leptonica-1.77.0
+++ b/metadata/md5-cache/media-libs/leptonica-1.77.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
 LICENSE=Apache-2.0
 RDEPEND=gif? ( >=media-libs/giflib-5.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( jpeg png tiff zlib )
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/DanBloomberg/leptonica/releases/download/1.77.0/leptonica-1.77.0.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2ab1cd73e634277aeb91ce6abc375f23
+_md5_=bab2f1452a7893290e0cf5834420cc04
diff --git a/metadata/md5-cache/media-libs/leptonica-1.78.0 b/metadata/md5-cache/media-libs/leptonica-1.78.0
index 888479fc6f3a..7aed0c99887a 100644
--- a/metadata/md5-cache/media-libs/leptonica-1.78.0
+++ b/metadata/md5-cache/media-libs/leptonica-1.78.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
 LICENSE=Apache-2.0
 RDEPEND=gif? ( >=media-libs/giflib-5.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( jpeg png tiff zlib )
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/DanBloomberg/leptonica/releases/download/1.78.0/leptonica-1.78.0.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2ab1cd73e634277aeb91ce6abc375f23
+_md5_=bab2f1452a7893290e0cf5834420cc04
diff --git a/metadata/md5-cache/media-libs/libcdr-0.1.5 b/metadata/md5-cache/media-libs/libcdr-0.1.5
index 0fe1af3dac9b..460f316078aa 100644
--- a/metadata/md5-cache/media-libs/libcdr-0.1.5
+++ b/metadata/md5-cache/media-libs/libcdr-0.1.5
@@ -8,7 +8,8 @@ IUSE=doc static-libs test
 KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.5.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=558c1af01152a42ffe4705e2ee805dd5
+_md5_=7ba3041160fdeb9552a5aa40b6abd71e
diff --git a/metadata/md5-cache/media-libs/libcdr-9999 b/metadata/md5-cache/media-libs/libcdr-9999
index 26f90ceb9252..33de2f859aae 100644
--- a/metadata/md5-cache/media-libs/libcdr-9999
+++ b/metadata/md5-cache/media-libs/libcdr-9999
@@ -8,6 +8,7 @@ IUSE=doc static-libs test
 LICENSE=MPL-2.0
 PROPERTIES=live
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=99efa10c19f0b9d575a00b74d9b7e2ad
+_md5_=29d723ee330f483a8d7a08c2a2b6dff3
diff --git a/metadata/md5-cache/media-libs/libebur128-1.2.3 b/metadata/md5-cache/media-libs/libebur128-1.2.3
index de4e8e0d114b..625f21b41ca9 100644
--- a/metadata/md5-cache/media-libs/libebur128-1.2.3
+++ b/metadata/md5-cache/media-libs/libebur128-1.2.3
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/jiixyj/libebur128
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/jiixyj/libebur128/archive/v1.2.3.tar.gz -> libebur128-1.2.3.tar.gz test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv05.zip )
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ac261a086c71f01b192ad0eb2beedee
+_md5_=bfd18efa8d2c448c4ca8669ced722639
diff --git a/metadata/md5-cache/media-libs/libebur128-1.2.4 b/metadata/md5-cache/media-libs/libebur128-1.2.4
index 1d951fcfdc93..148e9fd17465 100644
--- a/metadata/md5-cache/media-libs/libebur128-1.2.4
+++ b/metadata/md5-cache/media-libs/libebur128-1.2.4
@@ -7,7 +7,8 @@ HOMEPAGE=https://github.com/jiixyj/libebur128
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/jiixyj/libebur128/archive/v1.2.4.tar.gz -> libebur128-1.2.4.tar.gz test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv05.zip )
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3aaaccb6e40ce8bb73223b1c649ef9ef
+_md5_=7f88f8c830e0260298b4e9afaafd4d62
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.3-r1 b/metadata/md5-cache/media-libs/libepoxy-1.5.3-r1
index 0aeaeef48acc..002b710820f3 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.5.3-r1
+++ b/metadata/md5-cache/media-libs/libepoxy-1.5.3-r1
@@ -7,7 +7,8 @@ IUSE=+egl test +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 ab
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=egl? ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.3.tar.gz -> libepoxy-1.5.3.tar.gz
 _eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cf181cf7513b25a1d49f0fce10a9b18e
+_md5_=eb382a79545835ac8b1d2efc6579094d
diff --git a/metadata/md5-cache/media-libs/libfreehand-0.1.2 b/metadata/md5-cache/media-libs/libfreehand-0.1.2
index 553249f34daf..b16e2eb803a2 100644
--- a/metadata/md5-cache/media-libs/libfreehand-0.1.2
+++ b/metadata/md5-cache/media-libs/libfreehand-0.1.2
@@ -7,7 +7,8 @@ IUSE=doc static-libs test
 KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libfreehand/libfreehand-0.1.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86aca22c162d86197ba98378166c1fba
+_md5_=839f729d2f1912852d2a501973670729
diff --git a/metadata/md5-cache/media-libs/libfreehand-9999 b/metadata/md5-cache/media-libs/libfreehand-9999
index 7327ad781ac2..ee8ee29b3446 100644
--- a/metadata/md5-cache/media-libs/libfreehand-9999
+++ b/metadata/md5-cache/media-libs/libfreehand-9999
@@ -8,6 +8,7 @@ IUSE=doc static-libs test
 LICENSE=MPL-2.0
 PROPERTIES=live
 RDEPEND=dev-libs/librevenge sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6ac2649f2ed0e31c4a2676a43c2397a7
+_md5_=c2e81e352148662a5774181631b8b4f2
diff --git a/metadata/md5-cache/media-libs/libheif-1.5.1 b/metadata/md5-cache/media-libs/libheif-1.5.1
index 76f24a05fae9..6dae9ab26b49 100644
--- a/metadata/md5-cache/media-libs/libheif-1.5.1
+++ b/metadata/md5-cache/media-libs/libheif-1.5.1
@@ -8,7 +8,8 @@ IUSE=static-libs test +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 ab
 KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-3
 RDEPEND=media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0/1.5
 SRC_URI=https://github.com/strukturag/libheif/releases/download/v1.5.1/libheif-1.5.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b834dd926cbf3c79c43b4c03eb9a4392
+_md5_=dae5790a9559b817beaa101b1916063d
diff --git a/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r1 b/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r1
index 004cc120aca9..e762f2781e60 100644
--- a/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r1
+++ b/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r1
@@ -6,7 +6,8 @@ HOMEPAGE=https://code.google.com/p/mp4v2/
 IUSE=static-libs test utils
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MPL-1.1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mp4v2.googlecode.com/files/mp4v2-2.0.0.tar.bz2
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=393d46c926162ef5c99b823100248c10
+_md5_=412774c6e8382c2c87220b64a76121fc
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.16 b/metadata/md5-cache/media-libs/libmpdclient-2.16
index 7e55ac667d1a..b2dc15bcdba8 100644
--- a/metadata/md5-cache/media-libs/libmpdclient-2.16
+++ b/metadata/md5-cache/media-libs/libmpdclient-2.16
@@ -6,7 +6,8 @@ HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclie
 IUSE=doc examples test
 KEYWORDS=alpha amd64 arm ppc ppc64 ~sparc x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.16.tar.xz
 _eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4f7d9cece8c24369332c429aacfa6b88
+_md5_=2dfbc1d5c3501ba5825c304b64cbba14
diff --git a/metadata/md5-cache/media-libs/libmygpo-qt-1.1.0 b/metadata/md5-cache/media-libs/libmygpo-qt-1.1.0
index cf2077d7bedf..cbfe60acfcfa 100644
--- a/metadata/md5-cache/media-libs/libmygpo-qt-1.1.0
+++ b/metadata/md5-cache/media-libs/libmygpo-qt-1.1.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/libmygpo-qt/archive/1.1.0.tar.gz -> libmygpo-qt-1.1.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aadcb08d7305373bfd05a449b9265560
+_md5_=765d6ddd3a5046be07059dc079f194c2
diff --git a/metadata/md5-cache/media-libs/libmygpo-qt-9999 b/metadata/md5-cache/media-libs/libmygpo-qt-9999
index 1dd4b3de08d7..af567259d8a5 100644
--- a/metadata/md5-cache/media-libs/libmygpo-qt-9999
+++ b/metadata/md5-cache/media-libs/libmygpo-qt-9999
@@ -8,6 +8,7 @@ IUSE=test
 LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef1a43adcae48ed80518f5a6e5fbb780
+_md5_=1dbae86ae3def28f356d5efb79de6c81
diff --git a/metadata/md5-cache/media-libs/liboggz-1.1.1 b/metadata/md5-cache/media-libs/liboggz-1.1.1
index f95d071e934c..bff4bcd2aeb0 100644
--- a/metadata/md5-cache/media-libs/liboggz-1.1.1
+++ b/metadata/md5-cache/media-libs/liboggz-1.1.1
@@ -7,7 +7,8 @@ IUSE=doc static-libs test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=media-libs/libogg-1.2.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/liboggz/liboggz-1.1.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1ede0f9536dca6184948b8d276574398
+_md5_=822dff010d4d721e66e0ffdb10abc719
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.0.9 b/metadata/md5-cache/media-libs/libopenraw-0.0.9
index eab6860340e7..fed8686e9882 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.0.9
+++ b/metadata/md5-cache/media-libs/libopenraw-0.0.9
@@ -7,7 +7,8 @@ IUSE=gtk static-libs test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=virtual/jpeg:0 dev-libs/libxml2 gtk? ( >=dev-libs/glib-2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.0.9.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3c2a43192389f20348e74f3c7a1b4ff
+_md5_=6bd5367ce11a04ebc7ab7c71635f2160
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.1.2 b/metadata/md5-cache/media-libs/libopenraw-0.1.2
index f8b521c422e9..cca09808d9f0 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.1.2
+++ b/metadata/md5-cache/media-libs/libopenraw-0.1.2
@@ -7,7 +7,8 @@ IUSE=gtk static-libs test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
+RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.1.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f219aa8e447bfa078ad8b70099b3b75e
+_md5_=b17d175897a7315a19014e9e410f2604
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.1.3 b/metadata/md5-cache/media-libs/libopenraw-0.1.3
index 609cba3c4fe6..92716edab004 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.1.3
+++ b/metadata/md5-cache/media-libs/libopenraw-0.1.3
@@ -7,7 +7,8 @@ IUSE=gtk static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
+RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.1.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f02b6aa77c4439289e0473ff2a4436c1
+_md5_=2d07ff753dcb90670fb76d39826750c2
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609 b/metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609
index cf31c4f1f819..9ca7039a218b 100644
--- a/metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609
+++ b/metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.1.9_pre20190502:0= imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) libav? ( media-video/libav:0=[encode,x264,xvid,vpx,mp3,theora] ) !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0/17
 SRC_URI=https://github.com/OpenShot/libopenshot/archive/0d4ea7fe71e88bcee4a7fd1404bd52c8e2169997.tar.gz -> libopenshot-0.2.4_pre20190609.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c80ec221b396a03de6fae9e826fd705b
+_md5_=03b39570912486f4015a147986e3c9f0
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4 b/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
index 5844a5cacc27..62df2a05bbb8 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
@@ -8,7 +8,8 @@ IUSE=alsa minimal sqlite static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!minimal? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib ) sqlite? ( >=dev-db/sqlite-3.2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.28.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=94f11c70f61c80efa1b47eec24b48b81
+_md5_=c8bb862a5be662e7a35674888ead7eee
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.29_pre2_p20191024 b/metadata/md5-cache/media-libs/libsndfile-1.0.29_pre2_p20191024
index f383c2248790..f513477e09d9 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.29_pre2_p20191024
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.29_pre2_p20191024
@@ -8,7 +8,8 @@ IUSE=alsa minimal sqlite static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!minimal? ( >=media-libs/flac-1.2.1-r5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libvorbis-1.3.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib:= ) sqlite? ( >=dev-db/sqlite-3.2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erikd/libsndfile/archive/97a361afc24202b16489d8c06910277c06b18b53.tar.gz -> libsndfile-1.0.29_pre2_p20191024.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6281e23dc145707b0c9b0b732e2d0a5d
+_md5_=a80674157b19f4f80ae036b1c245678b
diff --git a/metadata/md5-cache/media-libs/libsndfile-9999 b/metadata/md5-cache/media-libs/libsndfile-9999
index d5f5d6a4e5cb..4e94685d4ddd 100644
--- a/metadata/md5-cache/media-libs/libsndfile-9999
+++ b/metadata/md5-cache/media-libs/libsndfile-9999
@@ -8,6 +8,7 @@ IUSE=alsa minimal sqlite static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_
 LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=!minimal? ( >=media-libs/flac-1.2.1-r5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libvorbis-1.3.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib:= ) sqlite? ( >=dev-db/sqlite-3.2 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ca0c2821a311bfa3df10712b4477171c
+_md5_=caa4efc439dbedaae0f260940080126e
diff --git a/metadata/md5-cache/media-libs/libvisio-0.1.7 b/metadata/md5-cache/media-libs/libvisio-0.1.7
index 19cdacf5f47f..c2128c25122e 100644
--- a/metadata/md5-cache/media-libs/libvisio-0.1.7
+++ b/metadata/md5-cache/media-libs/libvisio-0.1.7
@@ -8,7 +8,8 @@ IUSE=doc static-libs test tools
 KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libvisio/libvisio-0.1.7.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1a0e1ef0968b4136a14bb5eaf00cabd7
+_md5_=2ce67aa4cec07e4024bca2e0c1c0ee59
diff --git a/metadata/md5-cache/media-libs/libvisio-9999 b/metadata/md5-cache/media-libs/libvisio-9999
index c11eb41182a8..39f50920507f 100644
--- a/metadata/md5-cache/media-libs/libvisio-9999
+++ b/metadata/md5-cache/media-libs/libvisio-9999
@@ -8,6 +8,7 @@ IUSE=doc static-libs test tools
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 PROPERTIES=live
 RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d0efe39a84091c4de46e6a9a63789c50
+_md5_=14b87ea776e86e34f8516c10213090c7
diff --git a/metadata/md5-cache/media-libs/libvpx-1.5.0 b/metadata/md5-cache/media-libs/libvpx-1.5.0
index f96fdd2902d2..aae84a155d8f 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.5.0
+++ b/metadata/md5-cache/media-libs/libvpx-1.5.0
@@ -7,7 +7,8 @@ IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_fla
 KEYWORDS=amd64 arm arm64 ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.5.0.tar.bz2 test? ( mirror://gentoo/libvpx-testdata-1.5.0.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f177ea3d28f868d8b19bf35bc7f9d82d
+_md5_=e4886e1d69778cb8794aca7121f24ae8
diff --git a/metadata/md5-cache/media-libs/libvpx-1.6.0-r1 b/metadata/md5-cache/media-libs/libvpx-1.6.0-r1
index 2c62c7dd9222..7806b6f2046a 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.6.0-r1
+++ b/metadata/md5-cache/media-libs/libvpx-1.6.0-r1
@@ -7,7 +7,8 @@ IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_fla
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.6.0.tar.bz2 test? ( mirror://gentoo/libvpx-testdata-1.6.0.tar.bz2 )
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ff88f78f7a399598d20fc69b005e656f
+_md5_=e18a9377457ae878fa5a0c451797a160
diff --git a/metadata/md5-cache/media-libs/libxspf-1.2.0 b/metadata/md5-cache/media-libs/libxspf-1.2.0
index f439e36d364d..0d72c5ac2ca2 100644
--- a/metadata/md5-cache/media-libs/libxspf-1.2.0
+++ b/metadata/md5-cache/media-libs/libxspf-1.2.0
@@ -7,7 +7,8 @@ IUSE=static-libs test
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD LGPL-2.1
 RDEPEND=>=dev-libs/expat-2 >=dev-libs/uriparser-0.7.5
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/libspiff/libxspf-1.2.0.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e68bd165cfd602c89b6c9f1c478a808
+_md5_=a618098d3e43297c9c28d532606d5fc2
diff --git a/metadata/md5-cache/media-libs/libyami-1.0.1 b/metadata/md5-cache/media-libs/libyami-1.0.1
index 465353bb6e95..ae98b9f1923d 100644
--- a/metadata/md5-cache/media-libs/libyami-1.0.1
+++ b/metadata/md5-cache/media-libs/libyami-1.0.1
@@ -7,7 +7,8 @@ IUSE=debug dmabuf doc md5 v4l X test wayland abi_x86_32 abi_x86_64 abi_x86_x32 a
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=x11-libs/libva-1.7.2[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/01org/libyami/archive/libyami-1.0.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=43892f72cf33ec79200aef2b851eaaae
+_md5_=4bf12e4f2f29d65416ca876462ec7ae2
diff --git a/metadata/md5-cache/media-libs/libyami-1.1.0 b/metadata/md5-cache/media-libs/libyami-1.1.0
index c0e32eecf165..5cb60db72c1a 100644
--- a/metadata/md5-cache/media-libs/libyami-1.1.0
+++ b/metadata/md5-cache/media-libs/libyami-1.1.0
@@ -7,7 +7,8 @@ IUSE=debug egl dmabuf doc md5 v4l X test wayland abi_x86_32 abi_x86_64 abi_x86_x
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=x11-libs/libva-1.7.2[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/01org/libyami/archive/libyami-1.1.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=300d759d2fa2e09bd5cb33ea4af4d661
+_md5_=72b509e9bddf18b42f4ad846fb8bb034
diff --git a/metadata/md5-cache/media-libs/libyami-1.2.0 b/metadata/md5-cache/media-libs/libyami-1.2.0
index f3812a43ec60..1d62f8feae18 100644
--- a/metadata/md5-cache/media-libs/libyami-1.2.0
+++ b/metadata/md5-cache/media-libs/libyami-1.2.0
@@ -7,7 +7,8 @@ IUSE=debug egl dmabuf doc md5 v4l X test wayland abi_x86_32 abi_x86_64 abi_x86_x
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=x11-libs/libva-1.7.2[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/01org/libyami/archive/1.2.0.tar.gz -> libyami-1.2.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a538bd83016cd1f80454659f29c32fbb
+_md5_=dfa524af1b565780752f7f376aa8e470
diff --git a/metadata/md5-cache/media-libs/libyami-1.3.0 b/metadata/md5-cache/media-libs/libyami-1.3.0
index 11fa0f543f32..e81b7413cfee 100644
--- a/metadata/md5-cache/media-libs/libyami-1.3.0
+++ b/metadata/md5-cache/media-libs/libyami-1.3.0
@@ -7,7 +7,8 @@ IUSE=debug egl dmabuf doc md5 v4l X test wayland abi_x86_32 abi_x86_64 abi_x86_x
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=x11-libs/libva-1.7.2:=[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/01org/libyami/archive/libyami-1.3.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd574a5a5ab1773013805fe5cc8a5ab1
+_md5_=bcd187ead6dbec4510170e0980bc3726
diff --git a/metadata/md5-cache/media-libs/libyami-9999 b/metadata/md5-cache/media-libs/libyami-9999
index 98b5605277ab..f05c902f78af 100644
--- a/metadata/md5-cache/media-libs/libyami-9999
+++ b/metadata/md5-cache/media-libs/libyami-9999
@@ -7,6 +7,7 @@ IUSE=debug egl dmabuf doc md5 v4l X test wayland abi_x86_32 abi_x86_64 abi_x86_x
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=x11-libs/libva-1.7.2:=[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=665136659d08a13b4cc471d666dc7f34
+_md5_=18c2fa6ad2e2fb4ac39872ea132fb0d2
diff --git a/metadata/md5-cache/media-libs/libzmf-0.0.2 b/metadata/md5-cache/media-libs/libzmf-0.0.2
index d11f905d4e9b..9da2c66d3ab3 100644
--- a/metadata/md5-cache/media-libs/libzmf-0.0.2
+++ b/metadata/md5-cache/media-libs/libzmf-0.0.2
@@ -7,6 +7,7 @@ IUSE=debug doc test tools
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/libpng:0= sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libzmf/libzmf-0.0.2.tar.xz
-_md5_=5b467f40e2cb0641cc3ca2c12df688f5
+_md5_=3c9916f98271b43d28d7fd5bc80d81fc
diff --git a/metadata/md5-cache/media-libs/libzmf-9999 b/metadata/md5-cache/media-libs/libzmf-9999
index df900d413c5b..a04fec985154 100644
--- a/metadata/md5-cache/media-libs/libzmf-9999
+++ b/metadata/md5-cache/media-libs/libzmf-9999
@@ -7,6 +7,7 @@ IUSE=debug doc test tools
 LICENSE=MPL-2.0
 PROPERTIES=live
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/libpng:0= sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=df4d7abfc18879c2ce0387b745b436e9
+_md5_=160823f87ce5e44aeeb37f9601ef4381
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.4-r1 b/metadata/md5-cache/media-libs/lilv-0.24.4-r1
index f31f26edd4d3..e063b60c4899 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.4-r1
+++ b/metadata/md5-cache/media-libs/lilv-0.24.4-r1
@@ -7,7 +7,8 @@ IUSE=doc +dyn-manifest static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mi
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=ISC
 RDEPEND=>=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile >=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.4.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=781fce85d8d88d2a2bbc48c6f3c49a28
+_md5_=52c49b88616e1c95d17be0c7d0bd2f65
diff --git a/metadata/md5-cache/media-libs/musicbrainz-5.1.0 b/metadata/md5-cache/media-libs/musicbrainz-5.1.0
index 984d69528f01..1e44187fa217 100644
--- a/metadata/md5-cache/media-libs/musicbrainz-5.1.0
+++ b/metadata/md5-cache/media-libs/musicbrainz-5.1.0
@@ -7,7 +7,8 @@ IUSE=examples test
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2 net-libs/neon
+RESTRICT=!test? ( test )
 SLOT=5/1
 SRC_URI=https://github.com/metabrainz/libmusicbrainz/releases/download/release-5.1.0/libmusicbrainz-5.1.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d89b8d42164feabe9a73a24c08497b17
+_md5_=07e745a04bbf3526c24e69b91d7dab9f
diff --git a/metadata/md5-cache/media-libs/mutagen-1.42.0 b/metadata/md5-cache/media-libs/mutagen-1.42.0
index 71de404533a3..2e0d247e7b16 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.42.0
+++ b/metadata/md5-cache/media-libs/mutagen-1.42.0
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.42.0/mutagen-1.42.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d6e08183d176a8d0d098d777d373e4b8
+_md5_=8cec50a94cf2075b2d8bb5942ff0ea81
diff --git a/metadata/md5-cache/media-libs/openicc-0.1.0 b/metadata/md5-cache/media-libs/openicc-0.1.0
index a5a988c54ef4..ec485cf2b0b4 100644
--- a/metadata/md5-cache/media-libs/openicc-0.1.0
+++ b/metadata/md5-cache/media-libs/openicc-0.1.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/yajl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenICC/config/archive/0.1.0.tar.gz -> openicc-0.1.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db6671c7fbf2a80de3c5fda8785dbba9
+_md5_=18b6fe0da5a64b3c655a23f5b802ab0d
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.1 b/metadata/md5-cache/media-libs/openjpeg-2.3.1
index 954c1eee8d24..491d47124746 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.1
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.1
@@ -8,7 +8,8 @@ IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mip
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2 media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib:=
+RESTRICT=!test? ( test )
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz -> openjpeg-2.3.1.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/25632d6deca2e567d30ef476b4abe63916c36f6e.tar.gz -> openjpeg-data_20180620.tar.gz )
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e270ba02b21b9c92894affd143d6562
+_md5_=2deb56a992ad32868fdbeca3d53311ab
diff --git a/metadata/md5-cache/media-libs/raul-0.8.0-r1 b/metadata/md5-cache/media-libs/raul-0.8.0-r1
index 8297cef0a64a..4f132c2e1c24 100644
--- a/metadata/md5-cache/media-libs/raul-0.8.0-r1
+++ b/metadata/md5-cache/media-libs/raul-0.8.0-r1
@@ -7,7 +7,8 @@ IUSE=debug doc test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost >=dev-libs/glib-2.14.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/raul-0.8.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=de14abe454af6be660db73c1177ebe11
+_md5_=c8a9adbaedfe91e00eb940073c15a15f
diff --git a/metadata/md5-cache/media-libs/skstream-0.3.9 b/metadata/md5-cache/media-libs/skstream-0.3.9
index 9de98874be85..bed50d2eaa10 100644
--- a/metadata/md5-cache/media-libs/skstream-0.3.9
+++ b/metadata/md5-cache/media-libs/skstream-0.3.9
@@ -6,7 +6,8 @@ HOMEPAGE=https://www.worldforge.org/
 IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/worldforge/skstream-0.3.9.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79d55fdeb54171419ab8d7b311c7dfae
+_md5_=43287fbe95d2b044231e301cff9676f6
diff --git a/metadata/md5-cache/media-libs/soxr-0.1.3-r1 b/metadata/md5-cache/media-libs/soxr-0.1.3-r1
index c059b7446d91..e29bfe109323 100644
--- a/metadata/md5-cache/media-libs/soxr-0.1.3-r1
+++ b/metadata/md5-cache/media-libs/soxr-0.1.3-r1
@@ -7,7 +7,8 @@ IUSE=examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 a
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 REQUIRED_USE=test? ( examples )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/soxr/soxr-0.1.3-Source.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=553cec25ae7d5086bb2b51e7065e3d68
+_md5_=7c9e65af14489a0e5570a0c1892cb71e
diff --git a/metadata/md5-cache/media-libs/sratom-0.6.0-r1 b/metadata/md5-cache/media-libs/sratom-0.6.0-r1
index 9d38ac4a2333..6cbd8b7c8c3b 100644
--- a/metadata/md5-cache/media-libs/sratom-0.6.0-r1
+++ b/metadata/md5-cache/media-libs/sratom-0.6.0-r1
@@ -7,7 +7,8 @@ IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mip
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=ISC
 RDEPEND=>=media-libs/lv2-1.14.0-r1 >=dev-libs/serd-0.28.0-r1 >=dev-libs/sord-0.16.0-r1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sratom-0.6.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=773c7f4ef08fc99d19cb958a1ec507a7
+_md5_=184702a9658bd218f1a2ef921fbb3e7e
diff --git a/metadata/md5-cache/media-libs/taglib-1.11.1_p20190920-r1 b/metadata/md5-cache/media-libs/taglib-1.11.1_p20190920-r1
index 6fe3ab134100..bca3edc56578 100644
--- a/metadata/md5-cache/media-libs/taglib-1.11.1_p20190920-r1
+++ b/metadata/md5-cache/media-libs/taglib-1.11.1_p20190920-r1
@@ -8,7 +8,8 @@ IUSE=debug examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1 MPL-1.1
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taglib/taglib/archive/54508df30bc888c4d2359576ceb0cc8f2fa8dbdf.tar.gz -> taglib-1.11.1_p20190920.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=26b1b4bc85c9a2dfded3c62868e05f4e
+_md5_=bc2dd27e60965a5c356ebc1ec02598c4
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.10-r2 b/metadata/md5-cache/media-libs/tiff-4.0.10-r2
index a599e18a4104..27050fe40c8f 100644
--- a/metadata/md5-cache/media-libs/tiff-4.0.10-r2
+++ b/metadata/md5-cache/media-libs/tiff-4.0.10-r2
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh spa
 LICENSE=libtiff
 RDEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( jpeg )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.osgeo.org/libtiff/tiff-4.0.10.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=677cac6e36aa93c560c21c3cca4ff263
+_md5_=9c22ae196c15688a4913a79e0c51fbb6
diff --git a/metadata/md5-cache/media-libs/virglrenderer-0.6.0 b/metadata/md5-cache/media-libs/virglrenderer-0.6.0
index c5427d32357f..e4b9d24d531d 100644
--- a/metadata/md5-cache/media-libs/virglrenderer-0.6.0
+++ b/metadata/md5-cache/media-libs/virglrenderer-0.6.0
@@ -7,7 +7,8 @@ IUSE=static-libs test
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.50 media-libs/libepoxy
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tamiko/distfiles/virglrenderer-0.6.0.tar.xz
 _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_=5c93515aa8a09416e3306fbd63a1c22c
+_md5_=98f84e64dc214d5137b33d4a61bbce15
diff --git a/metadata/md5-cache/media-libs/virglrenderer-0.7.0 b/metadata/md5-cache/media-libs/virglrenderer-0.7.0
index 576ffb19621f..d82169d1d0bb 100644
--- a/metadata/md5-cache/media-libs/virglrenderer-0.7.0
+++ b/metadata/md5-cache/media-libs/virglrenderer-0.7.0
@@ -8,7 +8,8 @@ IUSE=static-libs test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.50 media-libs/libepoxy
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tamiko/distfiles/virglrenderer-0.7.0.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=82c905fd817f4d83ad64dbb1c15957cc
+_md5_=b410af00f7ddee6465f356eb26956486
diff --git a/metadata/md5-cache/media-libs/virglrenderer-9999 b/metadata/md5-cache/media-libs/virglrenderer-9999
index 21ac55528a76..61fd777d7e8e 100644
--- a/metadata/md5-cache/media-libs/virglrenderer-9999
+++ b/metadata/md5-cache/media-libs/virglrenderer-9999
@@ -7,6 +7,7 @@ IUSE=static-libs test
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=x11-libs/libdrm-2.4.50 media-libs/libepoxy
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fdd9d71d616fab26271558d396723026
+_md5_=ed0f9963989ba2e486cee4f980698e43
diff --git a/metadata/md5-cache/media-libs/x265-2.8 b/metadata/md5-cache/media-libs/x265-2.8
index 52829b9fa671..91518a9eb3b8 100644
--- a/metadata/md5-cache/media-libs/x265-2.8
+++ b/metadata/md5-cache/media-libs/x265-2.8
@@ -7,7 +7,8 @@ IUSE=+10bit +12bit cpu_flags_arm_neon numa pic power8 test abi_x86_32 abi_x86_64
 KEYWORDS=amd64 arm ~arm64 hppa ia64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/160
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_2.8.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=654beebcee007d09d44f2436f4436f6c
+_md5_=e71e76474b527e5df896332e4bcec5a3
diff --git a/metadata/md5-cache/media-libs/x265-2.9 b/metadata/md5-cache/media-libs/x265-2.9
index 3474658bff64..6dd4301bf188 100644
--- a/metadata/md5-cache/media-libs/x265-2.9
+++ b/metadata/md5-cache/media-libs/x265-2.9
@@ -7,7 +7,8 @@ IUSE=+10bit +12bit cpu_flags_arm_neon numa pic power8 test abi_x86_32 abi_x86_64
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/165
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_2.9.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c105df2462fc5d10848ead8b7751f58
+_md5_=2e956701f70cd9867bc666d2f45162f6
diff --git a/metadata/md5-cache/media-libs/x265-3.0 b/metadata/md5-cache/media-libs/x265-3.0
index d665807dc85b..807236a52a6c 100644
--- a/metadata/md5-cache/media-libs/x265-3.0
+++ b/metadata/md5-cache/media-libs/x265-3.0
@@ -7,7 +7,8 @@ IUSE=+10bit +12bit cpu_flags_arm_neon numa pic power8 test abi_x86_32 abi_x86_64
 KEYWORDS=~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/169
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78507b6761e4f68d9bc42cbc3210d5e8
+_md5_=b1cdb0ec283d637c144af28fc9136ceb
diff --git a/metadata/md5-cache/media-libs/x265-3.1 b/metadata/md5-cache/media-libs/x265-3.1
index c69780ae485a..2bf1c068e550 100644
--- a/metadata/md5-cache/media-libs/x265-3.1
+++ b/metadata/md5-cache/media-libs/x265-3.1
@@ -7,7 +7,8 @@ IUSE=+10bit +12bit cpu_flags_arm_neon numa pic power8 test abi_x86_32 abi_x86_64
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/176
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_3.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63e907d7aad73b6e38ef5bbb0b5a7aea
+_md5_=fb15b2740490c9537726619940a2ba77
diff --git a/metadata/md5-cache/media-libs/x265-3.1.2 b/metadata/md5-cache/media-libs/x265-3.1.2
index 5b933be8cb54..8f570d114491 100644
--- a/metadata/md5-cache/media-libs/x265-3.1.2
+++ b/metadata/md5-cache/media-libs/x265-3.1.2
@@ -7,7 +7,8 @@ IUSE=+10bit +12bit cpu_flags_arm_neon numa pic power8 test abi_x86_32 abi_x86_64
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/176
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_3.1.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63e907d7aad73b6e38ef5bbb0b5a7aea
+_md5_=fb15b2740490c9537726619940a2ba77
diff --git a/metadata/md5-cache/media-libs/x265-3.2 b/metadata/md5-cache/media-libs/x265-3.2
index 13ceeef7ca06..c19356f74685 100644
--- a/metadata/md5-cache/media-libs/x265-3.2
+++ b/metadata/md5-cache/media-libs/x265-3.2
@@ -7,7 +7,8 @@ IUSE=+10bit +12bit cpu_flags_arm_neon numa pic power8 test abi_x86_32 abi_x86_64
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/179
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=393a0168584c3b2fdae9882595767ced
+_md5_=a78573ff9d105ee68a47a22c162b5bef
diff --git a/metadata/md5-cache/media-libs/x265-9999 b/metadata/md5-cache/media-libs/x265-9999
index 23a481833ed1..1735c1b22553 100644
--- a/metadata/md5-cache/media-libs/x265-9999
+++ b/metadata/md5-cache/media-libs/x265-9999
@@ -7,6 +7,7 @@ IUSE=+10bit +12bit cpu_flags_arm_neon numa pic power8 test abi_x86_32 abi_x86_64
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/180
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b918e2108c75af9bfe181d22b3fa0f85
+_md5_=c88e5de114320ba69b7d767f4fd680c6
diff --git a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.8 b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.8
index 1b0a90741631..19c433a18c92 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.8
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.8
@@ -7,7 +7,8 @@ IUSE=daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb trac
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.3.6:0.3=[network,playlist] freebox? ( net-dns/avahi[dbus] ) >=dev-libs/gom-0.3.2-r1 chromaprint? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-chromaprint:1.0 ) dev-libs/json-glib daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) media-libs/libmediaart:2.0 net-libs/libsoup:2.4 dev-libs/libxml2:2 flickr? ( net-libs/liboauth ) dev-db/sqlite:3 >=dev-libs/totem-pl-parser-3.4.1 tracker? ( >=app-misc/tracker-0.10.5:= ) upnp-av? ( net-libs/dleyna-connector-dbus net-misc/dleyna-server ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 ) thetvdb? ( app-arch/libarchive ) youtube? ( >=dev-libs/libgdata-0.9.1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
+RESTRICT=!test? ( test )
 SLOT=0.3
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.3/grilo-plugins-0.3.8.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f7c17277b3fe01aaed8460ab42781de
+_md5_=ca06516f3ffd13ef4798e741f1f2ff0f
diff --git a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.9 b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.9
index c59cd494c90a..8b56400c11fe 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.9
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.9
@@ -8,7 +8,8 @@ IUSE=daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb trac
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.3.8:0.3=[network,playlist] freebox? ( net-dns/avahi[dbus] ) >=dev-libs/gom-0.3.2-r1 chromaprint? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-chromaprint:1.0 ) dev-libs/json-glib daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) media-libs/libmediaart:2.0 net-libs/libsoup:2.4 dev-libs/libxml2:2 flickr? ( net-libs/liboauth ) dev-db/sqlite:3 >=dev-libs/totem-pl-parser-3.4.1 tracker? ( >=app-misc/tracker-0.10.5:= ) upnp-av? ( net-libs/dleyna-connector-dbus net-misc/dleyna-server ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 ) thetvdb? ( app-arch/libarchive ) youtube? ( >=dev-libs/libgdata-0.9.1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
+RESTRICT=!test? ( test )
 SLOT=0.3
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.3/grilo-plugins-0.3.9.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a53614f22a107340c170a1e54c887e6
+_md5_=16b026c0434ce6070a574eb011ca7371
diff --git a/metadata/md5-cache/media-radio/tlf-1.3.2 b/metadata/md5-cache/media-radio/tlf-1.3.2
index f744e822a104..3dfa7ad058f1 100644
--- a/metadata/md5-cache/media-radio/tlf-1.3.2
+++ b/metadata/md5-cache/media-radio/tlf-1.3.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= dev-libs/glib:2 media-libs/hamlib media-sound/sox dev-libs/xmlrpc-c[curl]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/tlf/tlf-1.3.2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=893044928473fd572add797bc540cb0f
+_md5_=1929226476ad6aff0b73f387b8571603
diff --git a/metadata/md5-cache/media-radio/unixcw-3.5.1 b/metadata/md5-cache/media-radio/unixcw-3.5.1
index cecd5e93b52a..5dd096b5c14b 100644
--- a/metadata/md5-cache/media-radio/unixcw-3.5.1
+++ b/metadata/md5-cache/media-radio/unixcw-3.5.1
@@ -7,7 +7,8 @@ IUSE=alsa ncurses pulseaudio suid test qt5
 KEYWORDS=alpha amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/unixcw/unixcw-3.5.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=60228735f4a511439230219efe5927ad
+_md5_=76f6e67399a393eb5c6e1f7c136e5a5a
diff --git a/metadata/md5-cache/media-sound/apulse-0.1.12-r4 b/metadata/md5-cache/media-sound/apulse-0.1.12-r4
index f5d809a866af..672395a8dac1 100644
--- a/metadata/md5-cache/media-sound/apulse-0.1.12-r4
+++ b/metadata/md5-cache/media-sound/apulse-0.1.12-r4
@@ -7,7 +7,8 @@ IUSE=debug sdk test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=amd64 x86
 LICENSE=MIT LGPL-2.1
 RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdk? ( !media-sound/pulseaudio ) !!media-plugins/alsa-plugins[pulseaudio]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/i-rinat/apulse/archive/v0.1.12.tar.gz -> apulse-0.1.12.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a26060cd3d90954c129244dcac9e3c4
+_md5_=82e6d5dd3dd8f62cd2988d3f5dace4bd
diff --git a/metadata/md5-cache/media-sound/bluez-alsa-1.4.0 b/metadata/md5-cache/media-sound/bluez-alsa-1.4.0
index b183595a6ec4..d0b6829fd9e1 100644
--- a/metadata/md5-cache/media-sound/bluez-alsa-1.4.0
+++ b/metadata/md5-cache/media-sound/bluez-alsa-1.4.0
@@ -8,7 +8,8 @@ IUSE=aac debug hcitop ldac ofono static-libs test abi_x86_32 abi_x86_64 abi_x86_
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/glib-2.26[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/alsa-lib-1.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-wireless/bluez-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= aac? ( >=media-libs/fdk-aac-0.1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= ) ldac? ( >=media-libs/libldac-2.0.0 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Arkq/bluez-alsa/archive/v1.4.0.tar.gz -> bluez-alsa-1.4.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f87bcb1b1307638e1e36175e290ec4db
+_md5_=32b41606951a815f556f5dbde112d6fc
diff --git a/metadata/md5-cache/media-sound/bluez-alsa-2.0.0 b/metadata/md5-cache/media-sound/bluez-alsa-2.0.0
index 7f3c4950bdb3..e5699339caff 100644
--- a/metadata/md5-cache/media-sound/bluez-alsa-2.0.0
+++ b/metadata/md5-cache/media-sound/bluez-alsa-2.0.0
@@ -8,7 +8,8 @@ IUSE=aac debug hcitop ldac ofono static-libs test abi_x86_32 abi_x86_64 abi_x86_
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/glib-2.26[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/alsa-lib-1.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-wireless/bluez-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= aac? ( >=media-libs/fdk-aac-0.1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= ) ldac? ( >=media-libs/libldac-2.0.0 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Arkq/bluez-alsa/archive/v2.0.0.tar.gz -> bluez-alsa-2.0.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c78e46513a2f2d3b3d5f535b93dadec7
+_md5_=5589b8a1cd853ee7982482368f30db58
diff --git a/metadata/md5-cache/media-sound/bluez-alsa-9999 b/metadata/md5-cache/media-sound/bluez-alsa-9999
index bc833758d42e..0e85689b201b 100644
--- a/metadata/md5-cache/media-sound/bluez-alsa-9999
+++ b/metadata/md5-cache/media-sound/bluez-alsa-9999
@@ -8,6 +8,7 @@ IUSE=aac debug hcitop ldac ofono static-libs test abi_x86_32 abi_x86_64 abi_x86_
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.26[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/alsa-lib-1.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-wireless/bluez-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= aac? ( >=media-libs/fdk-aac-0.1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= ) ldac? ( >=media-libs/libldac-2.0.0 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c78e46513a2f2d3b3d5f535b93dadec7
+_md5_=5589b8a1cd853ee7982482368f30db58
diff --git a/metadata/md5-cache/media-sound/clementine-9999 b/metadata/md5-cache/media-sound/clementine-9999
index b49bb68144a5..25843e64b472 100644
--- a/metadata/md5-cache/media-sound/clementine-9999
+++ b/metadata/md5-cache/media-sound/clementine-9999
@@ -9,6 +9,7 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0:= virtual/opengl ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47157670bbfb6c40db48d6f7e33be8d1
+_md5_=4b6b79f65c6b4ab8e81bc0675d1f5549
diff --git a/metadata/md5-cache/media-sound/easytag-2.4.3-r1 b/metadata/md5-cache/media-sound/easytag-2.4.3-r1
index 61c055a58a2d..2b4e55af2bbb 100644
--- a/metadata/md5-cache/media-sound/easytag-2.4.3-r1
+++ b/metadata/md5-cache/media-sound/easytag-2.4.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc
 LICENSE=GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38:2 media-libs/libcanberra[gtk3] >=x11-libs/gtk+-3.10:3 flac? ( >=media-libs/flac-1.3 ) mp3? ( >=media-libs/id3lib-3.8.3-r8 >=media-libs/libid3tag-0.15.1b-r4 ) mp4? ( >=media-libs/taglib-1.9.1[mp4(+)] ) nautilus? ( gnome-base/nautilus ) opus? ( >=media-libs/opus-1.1 >=media-libs/opusfile-0.4 ) speex? ( >=media-libs/speex-1.2_rc1 ) vorbis? ( >=media-libs/libogg-1.3.1 >=media-libs/libvorbis-1.3.4 ) wavpack? ( >=media-sound/wavpack-4.70 )
 REQUIRED_USE=opus? ( vorbis ) speex? ( vorbis )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/easytag/2.4/easytag-2.4.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9a3df50d1cbde48b9dc60eaaf095b9b
+_md5_=ab40ef43bd5884e2eb8d1c14db576324
diff --git a/metadata/md5-cache/media-sound/flacon-4.1.0 b/metadata/md5-cache/media-sound/flacon-4.1.0
index 469d29d68bc8..3ca714eb9796 100644
--- a/metadata/md5-cache/media-sound/flacon-4.1.0
+++ b/metadata/md5-cache/media-sound/flacon-4.1.0
@@ -7,7 +7,8 @@ IUSE=test test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flacon/flacon/archive/v4.1.0.tar.gz -> flacon-4.1.0.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=becec8e01acba4b5883327e2dc511348
+_md5_=dfcecefa5b16384e793e58e3b125f558
diff --git a/metadata/md5-cache/media-sound/gpodder-3.10.5 b/metadata/md5-cache/media-sound/gpodder-3.10.5
index 4e9c7a7d918f..34701ed6fd90 100644
--- a/metadata/md5-cache/media-sound/gpodder-3.10.5
+++ b/metadata/md5-cache/media-sound/gpodder-3.10.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/isort[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/podcastparser-0.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/mygpoclient-1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) bluetooth? ( net-wireless/bluez ) mtp? ( >=media-libs/libmtp-1.0.0:= ) kernel_linux? ( sys-apps/iproute2 ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=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? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/gpodder/archive/3.10.5.tar.gz -> gpodder-3.10.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b8d340c7248b8a750a70c22b67680af
+_md5_=b85ff78b2563a9fb77e615dd2d50c4fa
diff --git a/metadata/md5-cache/media-sound/gpodder-3.9.1 b/metadata/md5-cache/media-sound/gpodder-3.9.1
index 3d3b92d878e1..41e288b6027b 100644
--- a/metadata/md5-cache/media-sound/gpodder-3.9.1
+++ b/metadata/md5-cache/media-sound/gpodder-3.9.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-python/eyeD3-0.7 >=dev-python/feedparser-5.1.2 dev-python/html5lib >=dev-python/mygpoclient-1.7 >=dev-python/pygtk-2.16:2 dbus? ( dev-python/dbus-python ) bluetooth? ( net-wireless/bluez ) ipod? ( media-libs/libgpod[python] ) mtp? ( >=media-libs/libmtp-1.0.0:= ) kernel_linux? ( sys-apps/iproute2 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://gpodder.org/src/gpodder-3.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8d52d4ddcd5c0f84451216445d58505
+_md5_=1a3d65fbb8f937bb9ffd3c1134a3caf9
diff --git a/metadata/md5-cache/media-sound/mpc-0.30 b/metadata/md5-cache/media-sound/mpc-0.30
index 7dd6df56cb8b..d8df892a1d0d 100644
--- a/metadata/md5-cache/media-sound/mpc-0.30
+++ b/metadata/md5-cache/media-sound/mpc-0.30
@@ -7,7 +7,8 @@ IUSE=iconv test
 KEYWORDS=amd64 arm ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libmpdclient iconv? ( virtual/libiconv )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpc/0/mpc-0.30.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e91607817a225d8406b6a65d5ac1ffee
+_md5_=251d1b039a26cc95e1e4f17aaccbf671
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.4.3 b/metadata/md5-cache/media-sound/rhythmbox-3.4.3
index 3e6a538a4225..432f2e4bcc35 100644
--- a/metadata/md5-cache/media-sound/rhythmbox-3.4.3
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.4.3
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.20.0:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5[xml] >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-python/pygobject-3.0:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) udev? ( dev-libs/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-libmms:1.0 || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-0.7.3[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] net-libs/libsoup:2.4[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) ) upnp-av? ( >=media-libs/grilo-0.3:0.3 >=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
 REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rhythmbox/3.4/rhythmbox-3.4.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b85b10f4aacaa6fad359422afde30e3f
+_md5_=10d283e58920f3322d4f67b1f609a5c7
diff --git a/metadata/md5-cache/media-sound/sound-juicer-3.24.0 b/metadata/md5-cache/media-sound/sound-juicer-3.24.0
index e7cc1d4988cf..11eb1a2a4323 100644
--- a/metadata/md5-cache/media-sound/sound-juicer-3.24.0
+++ b/metadata/md5-cache/media-sound/sound-juicer-3.24.0
@@ -7,7 +7,8 @@ IUSE=debug flac test vorbis
 KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.49.5:2[dbus] >=x11-libs/gtk+-3.21.6:3 media-libs/libcanberra[gtk3] >=app-cdr/brasero-2.90 sys-apps/dbus gnome-base/gsettings-desktop-schemas >=media-libs/libdiscid-0.4.0 >=media-libs/musicbrainz-5.0.1:5= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[vorbis?] flac? ( media-plugins/gst-plugins-flac:1.0 ) gnome-base/gvfs[cdda,udev] || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sound-juicer/3.24/sound-juicer-3.24.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20c9c455c3ee9abd4c00d9a958cb0b24
+_md5_=c009fdf0439f5f91d1b462ab0ded8074
diff --git a/metadata/md5-cache/media-sound/whipper-0.7.3-r1 b/metadata/md5-cache/media-sound/whipper-0.7.3-r1
index c5e6d40d23c1..6ba2533724a2 100644
--- a/metadata/md5-cache/media-sound/whipper-0.7.3-r1
+++ b/metadata/md5-cache/media-sound/whipper-0.7.3-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-cdr/cdrdao >=dev-libs/libcdio-paranoia-0.94_p2 dev-python/pycdio[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-musicbrainz-ngs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/flac media-libs/libsndfile media-libs/mutagen[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-sound/sox[flac] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whipper-team/whipper/archive/v0.7.3.tar.gz -> whipper-0.7.3.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=54bbbd4904b7a388120037cc221e0a52
+_md5_=bd3d22794249c05361dd7fc13a680be1
diff --git a/metadata/md5-cache/media-tv/kodi-18.3-r1 b/metadata/md5-cache/media-tv/kodi-18.3-r1
index 34de580346a6..46655b843b46 100644
--- a/metadata/md5-cache/media-tv/kodi-18.3-r1
+++ b/metadata/md5-cache/media-tv/kodi-18.3-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.3:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) || ( gles opengl ) ^^ ( gbm raspberry-pi wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.3-Leia-18.2.tar.gz -> ffmpeg-kodi-4.0.3-Leia-18.2.tar.gz ) https://github.com/xbmc/xbmc/archive/18.3-Leia.tar.gz -> kodi-18.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8894faeeb1291a620f670e613e61e7bc
+_md5_=a20535fdf2f9bac8d778ac2d7b03fddf
diff --git a/metadata/md5-cache/media-tv/kodi-18.4 b/metadata/md5-cache/media-tv/kodi-18.4
index 4920d630259b..e28f8e87404a 100644
--- a/metadata/md5-cache/media-tv/kodi-18.4
+++ b/metadata/md5-cache/media-tv/kodi-18.4
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) || ( gles opengl ) ^^ ( gbm raspberry-pi wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.4-Leia-18.4.tar.gz -> ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz ) https://github.com/xbmc/xbmc/archive/18.4-Leia.tar.gz -> kodi-18.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ea47e25a89288ab120542a11e208775
+_md5_=dddedbb6aa911fb5106a48854b7c7c71
diff --git a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r2 b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r2
index 34070373b528..96f280f13206 100644
--- a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r2
+++ b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD MIT
 RDEPEND=x11-libs/wxGTK:3.0[X,opengl,debug?] dev-lang/luajit:2[lua52compat] dev-libs/boost:=[icu,nls,threads] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet )
 REQUIRED_USE=|| ( alsa openal oss portaudio pulseaudio )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Aegisub/Aegisub/archive/b118fe7e7a5c37540e2f0aa75af105e272bad234.tar.gz -> aegisub-3.2.2_p20160518.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f17a7fd154559aa1c38cfee532ade419
+_md5_=978c493a53b78d060fa907cb63cf4408
diff --git a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r3 b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r3
index b91833870aa4..5d0c727fefd4 100644
--- a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r3
+++ b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD MIT
 RDEPEND=x11-libs/wxGTK:3.0[X,opengl,debug?] dev-lang/luajit:2[lua52compat] dev-libs/boost:=[icu,nls,threads] dev-libs/icu:= media-libs/ffmpegsource:= media-libs/fontconfig media-libs/freetype media-libs/libass:=[fontconfig] sys-libs/zlib virtual/libiconv virtual/opengl alsa? ( media-libs/alsa-lib ) fftw? ( >=sci-libs/fftw-3.3:= ) openal? ( media-libs/openal ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/hunspell:= ) uchardet? ( app-i18n/uchardet )
 REQUIRED_USE=|| ( alsa openal oss portaudio pulseaudio )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Aegisub/Aegisub/archive/b118fe7e7a5c37540e2f0aa75af105e272bad234.tar.gz -> aegisub-3.2.2_p20160518.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aced77c192b1b22875c3a6c0d7a9c9c3
+_md5_=6218dbaf87b469d54abbe348a5298349
diff --git a/metadata/md5-cache/media-video/clive-2.3.0.1 b/metadata/md5-cache/media-video/clive-2.3.0.1
index 17a3a444f235..4aca487ded99 100644
--- a/metadata/md5-cache/media-video/clive-2.3.0.1
+++ b/metadata/md5-cache/media-video/clive-2.3.0.1
@@ -7,7 +7,8 @@ IUSE=clipboard pager password test
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-perl/BerkeleyDB-0.34 >=dev-perl/Config-Tiny-2.12 >=virtual/perl-Digest-SHA-5.47 >=dev-perl/HTML-TokeParser-Simple-2.37 >=dev-perl/Class-Singleton-1.4 >=dev-perl/WWW-Curl-4.05 >=dev-perl/XML-Simple-2.18 >=dev-perl/Getopt-ArgvFile-1.11 dev-perl/JSON-XS dev-perl/URI virtual/perl-Getopt-Long virtual/perl-File-Spec clipboard? ( >=dev-perl/Clipboard-0.09 ) pager? ( >=dev-perl/IO-Pager-0.05 ) password? ( >=dev-perl/Expect-1.21 ) media-libs/quvi || ( net-misc/wget net-misc/curl ) dev-lang/perl[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/clive/2.3/clive-2.3.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f66925955e1c422a1133b59a5730dfba
+_md5_=8aeee870341f23058d24e292645f078d
diff --git a/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0-r1 b/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0-r1
index 3d0418ad9b96..22b4d5f3e3e9 100644
--- a/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0-r1
+++ b/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=gtk? ( dev-libs/glib:2= ) jpeg? ( virtual/jpeg:0= ) !libav? ( >=media-video/ffmpeg-2.7:0= ) libav? ( >=media-video/libav-11:0= ) png? ( media-libs/libpng:0= )
 REQUIRED_USE=gnome? ( gtk ) test? ( png jpeg )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/2.2.0/ffmpegthumbnailer-2.2.0.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=af64206c86d0408fd96d3286962ad82a
+_md5_=fd4d0c351476494e182d8401f9451086
diff --git a/metadata/md5-cache/media-video/libva-utils-2.4.0 b/metadata/md5-cache/media-video/libva-utils-2.4.0
index b905732d7917..c46218fca38a 100644
--- a/metadata/md5-cache/media-video/libva-utils-2.4.0
+++ b/metadata/md5-cache/media-video/libva-utils-2.4.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 )
 REQUIRED_USE=|| ( drm wayland X )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intel/libva-utils/releases/download/2.4.0/libva-utils-2.4.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=896917bea799b7484b6c717a0ff0a349
+_md5_=11aaf6ee3639d8091d7e8fa9afc24d1b
diff --git a/metadata/md5-cache/media-video/libva-utils-9999 b/metadata/md5-cache/media-video/libva-utils-9999
index 9dcf01a18a2a..4716cd746c0b 100644
--- a/metadata/md5-cache/media-video/libva-utils-9999
+++ b/metadata/md5-cache/media-video/libva-utils-9999
@@ -9,6 +9,7 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 )
 REQUIRED_USE=|| ( drm wayland X )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4231e2cebaedf0f5a41d7bb92dbf3d96
+_md5_=4f569e19847b76cd5b1634d2ee734da7
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-35.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-35.0.0
index d239add17fe7..ede2675ddb99 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-35.0.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-35.0.0
@@ -7,7 +7,8 @@ IUSE=debug nls pch test qt5
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libfmt-5.3.0:= >=dev-libs/boost-1.49.0:= >=dev-libs/libebml-1.3.7:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.5.0:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-35.0.0.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db98b24fde943ac639689c55644cb460
+_md5_=cba37e457bdb6e0d2a1406cd94eaafe9
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-37.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-37.0.0
index 4e8f0908c9f2..a68d92d37b3d 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-37.0.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-37.0.0
@@ -8,7 +8,8 @@ IUSE=debug nls pch test qt5
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= >=dev-libs/libebml-1.3.7:= >=dev-libs/libfmt-5.3.0:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.5.0:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-37.0.0.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=734c77f5ff7352528841a453fd6f72ba
+_md5_=e03d21b238a18aac3767e7ff62cd5349
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9999 b/metadata/md5-cache/media-video/mkvtoolnix-9999
index 351c2a4cbc07..673cb2754af5 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-9999
+++ b/metadata/md5-cache/media-video/mkvtoolnix-9999
@@ -8,6 +8,7 @@ IUSE=debug nls pch test qt5
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= >=dev-libs/libebml-1.3.7:= >=dev-libs/libfmt-5.3.0:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.5.0:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6af63343d07b9c9a92d7ca266b153c57
+_md5_=684193ddda3d0bb69137fe1b982c53dc
diff --git a/metadata/md5-cache/media-video/peek-1.3.1-r2 b/metadata/md5-cache/media-video/peek-1.3.1-r2
index 9432a3a5dad2..93c95d306342 100644
--- a/metadata/md5-cache/media-video/peek-1.3.1-r2
+++ b/metadata/md5-cache/media-video/peek-1.3.1-r2
@@ -7,7 +7,8 @@ IUSE=keybinder test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.38:2 media-video/ffmpeg[X,encode,vpx,xcb] virtual/imagemagick-tools >=x11-libs/gtk+-3.14:3 keybinder? ( dev-libs/keybinder:3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/phw/peek/archive/1.3.1.tar.gz -> peek-1.3.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b71836f024f9c3919b5855b5786cc2dd
+_md5_=0ba929b9508f26b0137f6b77604b641d
diff --git a/metadata/md5-cache/media-video/peek-1.4.0 b/metadata/md5-cache/media-video/peek-1.4.0
index 6cc1121f4147..31633a8a4324 100644
--- a/metadata/md5-cache/media-video/peek-1.4.0
+++ b/metadata/md5-cache/media-video/peek-1.4.0
@@ -7,7 +7,8 @@ IUSE=keybinder test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.38:2 media-video/ffmpeg[X,encode,vpx,xcb] virtual/imagemagick-tools >=x11-libs/gtk+-3.20:3 keybinder? ( dev-libs/keybinder:3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/phw/peek/archive/1.4.0.tar.gz -> peek-1.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=507d782c681249c8b621fc0886f8b4fc
+_md5_=3f839d5a797a0e62a21af0778a7c9ef1
diff --git a/metadata/md5-cache/media-video/pitivi-0.97.1 b/metadata/md5-cache/media-video/pitivi-0.97.1
index b8f5ee232499..ecd5149b459b 100644
--- a/metadata/md5-cache/media-video/pitivi-0.97.1
+++ b/metadata/md5-cache/media-video/pitivi-0.97.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_5] ) >=dev-python/pycairo-1.10[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?] >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.8.2:1.0[introspection] >=media-plugins/gst-transcoder-1.8.2-r1 >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= dev-python/dbus-python[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?] >=dev-python/gst-python-1.4:1.0[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?] dev-python/matplotlib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?] dev-python/numpy[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?] dev-python/pycanberra[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?] >=dev-python/pygobject-3.8:3[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?] gnome-base/librsvg:= gnome-base/gnome-desktop:3=[introspection] >=media-libs/gstreamer-editing-services-1.8.2:1.0[introspection] >=media-libs/gst-plugins-base-1.8.2:1.0[introspection] >=media-libs/gst-plugins-bad-1.8.2:1.0[gtk] >=media-libs/gst-plugins-good-1.8.2:1.0 >=media-plugins/gst-plugins-libav-1.8.2:1.0 x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.8.2:1.0 )
 REQUIRED_USE=^^ ( python_single_target_python3_5 ) python_single_target_python3_5? ( python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.97/pitivi-0.97.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e90704c3fade8a495fdb9a9fa22de5df
+_md5_=acdd6bbd897eadef5021ddbf388fd97b
diff --git a/metadata/md5-cache/media-video/pitivi-0.98.1 b/metadata/md5-cache/media-video/pitivi-0.98.1
index 359382a4faec..8707bf6eda01 100644
--- a/metadata/md5-cache/media-video/pitivi-0.98.1
+++ b/metadata/md5-cache/media-video/pitivi-0.98.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/pycairo-1.10[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.10.2:1.0[introspection] >=media-plugins/gst-transcoder-1.8.2-r1 >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= dev-python/dbus-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/gst-python-1.4:1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/matplotlib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycanberra[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3.8:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/librsvg:= >=media-libs/gstreamer-editing-services-1.10.2:1.0[introspection] >=media-libs/gst-plugins-base-1.10.2:1.0[introspection] >=media-libs/gst-plugins-bad-1.10.2:1.0[gtk] >=media-libs/gst-plugins-good-1.10.2:1.0 >=media-plugins/gst-plugins-libav-1.10.2:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.10.2:1.0 x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.10.2:1.0 )
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.98/pitivi-0.98.1.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=5fe04727329933ed1711e48328224e5f
+_md5_=1fd2c606c73692013f86408c83a1249b
diff --git a/metadata/md5-cache/media-video/pitivi-0.999 b/metadata/md5-cache/media-video/pitivi-0.999
index f0dc2730088c..6adfa94512b1 100644
--- a/metadata/md5-cache/media-video/pitivi-0.999
+++ b/metadata/md5-cache/media-video/pitivi-0.999
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/pycairo-1.10[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.14.2:1.0[introspection] >=media-plugins/gst-transcoder-1.8.2-r1 >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= dev-python/dbus-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/gst-python-1.4:1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/matplotlib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3.8:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/librsvg:= >=media-libs/gsound-1.0 >=media-libs/gstreamer-editing-services-1.14.2:1.0[introspection] >=media-libs/gst-plugins-base-1.14.2:1.0[introspection] >=media-libs/gst-plugins-bad-1.14.2:1.0[gtk] >=media-libs/gst-plugins-good-1.14.2:1.0 >=media-plugins/gst-plugins-libav-1.14.2:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.14.2:1.0 >=x11-libs/libnotify-0.7[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.14.2:1.0 )
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.999/pitivi-0.999.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb703c43ff147456f527318f3a28ab0e
+_md5_=891f91c50d8499b3cb8aee37b75cce3e
diff --git a/metadata/md5-cache/media-video/subliminal-9999 b/metadata/md5-cache/media-video/subliminal-9999
index 849fb12a6e6f..37125fbfaaa9 100644
--- a/metadata/md5-cache/media-video/subliminal-9999
+++ b/metadata/md5-cache/media-video/subliminal-9999
@@ -9,7 +9,8 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-python/appdirs-1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/babelfish-0.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/beautifulsoup-4.4.0:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/guessit-2.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2012c[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rarfile-2.7[compressed,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2fb23d3aa2ea9ee64a65df2d2ba87635
+_md5_=1a8d73a342fe0540e8c17b21e3623cf5
diff --git a/metadata/md5-cache/media-video/totem-3.30.0 b/metadata/md5-cache/media-video/totem-3.30.0
index 041de87a7016..22bd33ae186c 100644
--- a/metadata/md5-cache/media-video/totem-3.30.0
+++ b/metadata/md5-cache/media-video/totem-3.30.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.19.4:3[X,introspection?] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[X,pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas x11-libs/libX11 >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) cdr? ( >=dev-libs/libxml2-2.6:2 ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.91.3 ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5[threads] >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/pygobject-2.90.3:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) media-plugins/grilo-plugins:0.3 media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-1.1.0[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/dbus-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
 REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/3.30/totem-3.30.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ab3587da1b3a42f0e66cc9e314458f7
+_md5_=2daf2970ced28eebf163a546e3566350
diff --git a/metadata/md5-cache/net-analyzer/arping-2.17 b/metadata/md5-cache/net-analyzer/arping-2.17
index 5a43675b81c8..4a1c50fbb994 100644
--- a/metadata/md5-cache/net-analyzer/arping-2.17
+++ b/metadata/md5-cache/net-analyzer/arping-2.17
@@ -7,7 +7,8 @@ IUSE=test +filecaps
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)]
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=http://www.habets.pp.se/synscan/files/arping-2.17.tar.gz
 _eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16
-_md5_=9105276ad746d9dab84b10b335e6b2e0
+_md5_=81e49b3084259af8d4e810e2ef4b2059
diff --git a/metadata/md5-cache/net-analyzer/arping-2.19 b/metadata/md5-cache/net-analyzer/arping-2.19
index 5c87c189c2be..f1edd376bbbf 100644
--- a/metadata/md5-cache/net-analyzer/arping-2.19
+++ b/metadata/md5-cache/net-analyzer/arping-2.19
@@ -7,7 +7,8 @@ IUSE=test +filecaps
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)]
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=http://www.habets.pp.se/synscan/files/arping-2.19.tar.gz
 _eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16
-_md5_=313363321a1cdcc6a9a604bc26d3cc08
+_md5_=0a0e592be23f144d113b6bc90c252ec5
diff --git a/metadata/md5-cache/net-analyzer/arping-2.20 b/metadata/md5-cache/net-analyzer/arping-2.20
index 7ee7314403b6..d3fb1a714856 100644
--- a/metadata/md5-cache/net-analyzer/arping-2.20
+++ b/metadata/md5-cache/net-analyzer/arping-2.20
@@ -8,7 +8,8 @@ IUSE=test +filecaps
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)]
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ThomasHabets/arping/archive/arping-2.20.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dea9f13ebe1f2fd32c78c7e4ac0f88ce
+_md5_=997c8feff8d4f643cd66a0cce3697010
diff --git a/metadata/md5-cache/net-analyzer/ettercap-0.8.3 b/metadata/md5-cache/net-analyzer/ettercap-0.8.3
index 7c674992b279..2819b11fbc06 100644
--- a/metadata/md5-cache/net-analyzer/ettercap-0.8.3
+++ b/metadata/md5-cache/net-analyzer/ettercap-0.8.3
@@ -8,7 +8,8 @@ IUSE=doc geoip gtk ipv6 libressl ncurses +plugins test
 KEYWORDS=~alpha amd64 arm ppc ppc64 sparc x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib geoip? ( dev-libs/geoip ) gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) plugins? ( >=net-misc/curl-7.26.0 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ettercap/ettercap/archive/v0.8.3.tar.gz -> ettercap-0.8.3.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3720eb611df05751167c24659ef036e5
+_md5_=91e95cd10a93899e64ab6c7790c0eaca
diff --git a/metadata/md5-cache/net-analyzer/ettercap-9999 b/metadata/md5-cache/net-analyzer/ettercap-9999
index 4b7ead6280f2..d3ebfdc8c6cb 100644
--- a/metadata/md5-cache/net-analyzer/ettercap-9999
+++ b/metadata/md5-cache/net-analyzer/ettercap-9999
@@ -7,6 +7,7 @@ IUSE=doc gtk ipv6 libressl ncurses +plugins test
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) plugins? ( >=net-misc/curl-7.26.0 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea5ac4d365e9654dbd4cebecb0624864
+_md5_=b3cca4cb6a9b909325fd04af895313c5
diff --git a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p10 b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p10
index 02a0b50d72ef..c7a44015f202 100644
--- a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p10
+++ b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p10
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS:0 ) python? ( python_targets_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(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mathias-kettner.de/download/mk-livestatus-1.2.8p10.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=159addd100c72e0a5903f4bf19b6379b
+_md5_=cc09387c465803b3b0d368ee29f0350f
diff --git a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p16 b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p16
index 6988ce3f34b6..71b38d498719 100644
--- a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p16
+++ b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p16
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS:0 ) python? ( 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? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mathias-kettner.de/download/mk-livestatus-1.2.8p16.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a0ecc28b55850f44b2465db40496ed54
+_md5_=b85602cf4968bf25f09753a8fd649de1
diff --git a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p26 b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p26
index 96632ce844ba..f4892b6d8f3c 100644
--- a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p26
+++ b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p26
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS:0 ) python? ( 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? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mathias-kettner.de/download/mk-livestatus-1.2.8p26.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9ad265bd8250fddb587d9da6b9e4ff89
+_md5_=4d9669e241520999f2514bbd83544218
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.49 b/metadata/md5-cache/net-analyzer/munin-2.0.49
index eb268c3d234e..3b289a786917 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.49
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.49
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) !<sys-apps/openrc-0.11.8 java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.49.tar.gz -> munin-2.0.49.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.49-gentoo-1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fdf51b223fdf0945453d919811d1afa0
+_md5_=c2f0d0fda95532efa7c9bbf3adcbea80
diff --git a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3-r1 b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3-r1
index 161307c47719..01d7daffb1bb 100644
--- a/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3-r1
+++ b/metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=net-libs/ripe-atlas-sagan-1.1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-client/ripe-atlas-cousteau-1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/tzlocal[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.tools/ripe.atlas.tools-1.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9d3f1fed1d7d46938f6442f1908f211
+_md5_=15238d1cd63d1809701b5ceadc7ad7e4
diff --git a/metadata/md5-cache/net-analyzer/sslsplit-0.5.4 b/metadata/md5-cache/net-analyzer/sslsplit-0.5.4
index 279ff1aa4865..210f66b9979b 100644
--- a/metadata/md5-cache/net-analyzer/sslsplit-0.5.4
+++ b/metadata/md5-cache/net-analyzer/sslsplit-0.5.4
@@ -7,7 +7,8 @@ IUSE=elibc_musl test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libevent[ssl,threads] dev-libs/openssl:0= net-libs/libnet:1.1 elibc_musl? ( sys-libs/fts-standalone )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/droe/sslsplit/archive/0.5.4.tar.gz -> sslsplit-0.5.4.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e16ded5611f308f802ee0eaa2f2fbbc6
+_md5_=5725f991417232ba35fe2a2c056e7e75
diff --git a/metadata/md5-cache/net-analyzer/sslsplit-0.5.5 b/metadata/md5-cache/net-analyzer/sslsplit-0.5.5
index f539fe4c8f3d..0085ff74d8f3 100644
--- a/metadata/md5-cache/net-analyzer/sslsplit-0.5.5
+++ b/metadata/md5-cache/net-analyzer/sslsplit-0.5.5
@@ -7,7 +7,8 @@ IUSE=elibc_musl test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libevent[ssl,threads] dev-libs/openssl:0= net-libs/libnet:1.1 elibc_musl? ( sys-libs/fts-standalone )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/droe/sslsplit/archive/0.5.5.tar.gz -> sslsplit-0.5.5.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c10ba8e557991af33a768ce1c908599f
+_md5_=e2db621f20b2d7eb980dfe88b7dd56dc
diff --git a/metadata/md5-cache/net-analyzer/sslsplit-9999 b/metadata/md5-cache/net-analyzer/sslsplit-9999
index d07d3dc66b82..0a8569f0080e 100644
--- a/metadata/md5-cache/net-analyzer/sslsplit-9999
+++ b/metadata/md5-cache/net-analyzer/sslsplit-9999
@@ -8,6 +8,7 @@ IUSE=elibc_musl test
 LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=dev-libs/libevent[ssl,threads] dev-libs/openssl:0= net-libs/libnet:1.1 elibc_musl? ( sys-libs/fts-standalone )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c10ba8e557991af33a768ce1c908599f
+_md5_=e2db621f20b2d7eb980dfe88b7dd56dc
diff --git a/metadata/md5-cache/net-analyzer/suricata-4.0.4 b/metadata/md5-cache/net-analyzer/suricata-4.0.4
index e123ab8d7482..3610272a698c 100644
--- a/metadata/md5-cache/net-analyzer/suricata-4.0.4
+++ b/metadata/md5-cache/net-analyzer/suricata-4.0.4
@@ -7,7 +7,8 @@ IUSE=+af-packet control-socket cuda debug +detection geoip hardened logrotate lu
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-4.0.4.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	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6fcc354df502abf0fe6a690a789169b6
+_md5_=fd76c7f142291d173c717ca045aa3fe5
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3 b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3
index 75ba257180db..a59abe8fa73a 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3
@@ -7,7 +7,8 @@ IUSE=+drop-root libressl smi ssl samba suid test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/tcpdump-4.9.3.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=73532bf38bd9599282b86a957aba6e06
+_md5_=de7bcdc0cf56ef26939c156d2dd4e3ed
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-9999 b/metadata/md5-cache/net-analyzer/tcpdump-9999
index 723bc0f3f2e7..6d06146eff76 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-9999
+++ b/metadata/md5-cache/net-analyzer/tcpdump-9999
@@ -8,6 +8,7 @@ IUSE=+drop-root libressl smi ssl samba suid test
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=2ce719a128b71e3e9683429d6a092162
+_md5_=a2849a73b9c8a49a906b06b78c7d9991
diff --git a/metadata/md5-cache/net-analyzer/vnstat-1.17 b/metadata/md5-cache/net-analyzer/vnstat-1.17
index 4093cf9e9cfa..e20f47675ba8 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-1.17
+++ b/metadata/md5-cache/net-analyzer/vnstat-1.17
@@ -7,7 +7,8 @@ IUSE=gd selinux test
 KEYWORDS=amd64 arm hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://humdi.net/vnstat/vnstat-1.17.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=b9bb41669344d610129220c3d9bd7257
+_md5_=d0f283051261fa364afedc933628d68e
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.3 b/metadata/md5-cache/net-analyzer/vnstat-2.3
index 107315040c77..930529148ccd 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-2.3
+++ b/metadata/md5-cache/net-analyzer/vnstat-2.3
@@ -8,7 +8,8 @@ IUSE=gd selinux test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://humdi.net/vnstat/vnstat-2.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=f01c21d9c9649d1c79cbb1cfeb5017dc
+_md5_=3d728fee6e540b6e189d9cd21e0cb3c1
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.4 b/metadata/md5-cache/net-analyzer/vnstat-2.4
index ee9fd25f40b0..10a3b1a1a026 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-2.4
+++ b/metadata/md5-cache/net-analyzer/vnstat-2.4
@@ -8,7 +8,8 @@ IUSE=gd selinux test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://humdi.net/vnstat/vnstat-2.4.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=3ca9ed9a38879c4ff4456868525074a1
+_md5_=cc003a32f3c081c6aeaca231b663e0d0
diff --git a/metadata/md5-cache/net-analyzer/vnstat-9999 b/metadata/md5-cache/net-analyzer/vnstat-9999
index 3fe5cffef5a0..c96d66bbf740 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-9999
+++ b/metadata/md5-cache/net-analyzer/vnstat-9999
@@ -8,6 +8,7 @@ IUSE=gd selinux test
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=3bc17705b7bc62d4df2e6d94726cb79e
+_md5_=2c89889442866b6ff7eb07b666fff484
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.19 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.19
index 2a8bf985e8e2..787598a3135e 100644
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.19
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.19
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/jedisct1/dnscrypt-proxy
 IUSE=pie test +filecaps
 KEYWORDS=amd64 ~arm ~x86
 LICENSE=ISC
-RESTRICT=strip
+RESTRICT=strip !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.19.tar.gz -> dnscrypt-proxy-2.0.19.tar.gz
 _eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=bf205ead93e669a821c670f6afd539f3
+_md5_=fcdfc38380ca1cde658bd77db9a8e9e2
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.3.3-r1 b/metadata/md5-cache/net-dns/dnsdist-1.3.3-r1
index 71dce1753e61..e00a3b78968e 100644
--- a/metadata/md5-cache/net-dns/dnsdist-1.3.3-r1
+++ b/metadata/md5-cache/net-dns/dnsdist-1.3.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.35:= dev-libs/libedit:= fstrm? ( dev-libs/fstrm:= ) luajit? ( dev-lang/luajit:= ) !luajit? ( >=dev-lang/lua-5.1:= ) remote-logging? ( >=dev-libs/protobuf-3:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( dev-libs/libsodium:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= )
 REQUIRED_USE=dnscrypt? ( ssl ) gnutls? ( ssl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.3.3.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=e79dc9227628fa254b6285fe70bed67a
+_md5_=7791b28039147cf362809898a3b7401d
diff --git a/metadata/md5-cache/net-dns/dnsdist-9999 b/metadata/md5-cache/net-dns/dnsdist-9999
index 248e1dd44005..277d8eddf03b 100644
--- a/metadata/md5-cache/net-dns/dnsdist-9999
+++ b/metadata/md5-cache/net-dns/dnsdist-9999
@@ -9,6 +9,7 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-libs/boost-1.35:= dev-libs/libedit:= fstrm? ( dev-libs/fstrm:= ) luajit? ( dev-lang/luajit:= ) !luajit? ( >=dev-lang/lua-5.1:= ) remote-logging? ( >=dev-libs/protobuf-3:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( dev-libs/libsodium:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= )
 REQUIRED_USE=dnscrypt? ( ssl ) gnutls? ( ssl )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=e79dc9227628fa254b6285fe70bed67a
+_md5_=7791b28039147cf362809898a3b7401d
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.3.18-r1 b/metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
index 56bb1275d804..d3e989393c1e 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
 RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns curl? ( net-misc/curl ) mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm ) eppclient? ( curl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.3.18.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c489b3a9e69da76fc486828c22cc7dcc
+_md5_=b6aaf0adc83e8fc03acb0a60f3493540
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1 b/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
index 6b02ca1b210b..add53cfe13cf 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
 RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.4.12.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	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4726f16770bce84a110dafd6820ec96b
+_md5_=d4ddcab9b5367cd289038b2eb2283cbb
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.4.8.2 b/metadata/md5-cache/net-dns/opendnssec-1.4.8.2
index 02da01a7d802..dc42d4a61658 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.4.8.2
+++ b/metadata/md5-cache/net-dns/opendnssec-1.4.8.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
 RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.4.8.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=8e1a5a48f716a3c66495fa558e5a2892
+_md5_=078d9a9d67fd3215d5d365dc337b8139
diff --git a/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1 b/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
index 46b0912407d1..6695a4c37fd6 100644
--- a/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
 RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) readline? ( sys-libs/readline:0 ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-2.0.1.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	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9598458e7fc8b4a55711ec8927e70567
+_md5_=df94060f5c8512858807f440a28932bd
diff --git a/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1 b/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
index 846b4840e2b2..a40c441af082 100644
--- a/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
 RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( dev-db/mysql-connector-c:0= dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) readline? ( sys-libs/readline:0 ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-2.0.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=01de57985e22218ca97c31e6cb9ecbe9
+_md5_=6977db72737cfa8146c471658c4b1319
diff --git a/metadata/md5-cache/net-dns/pdns-4.1.13 b/metadata/md5-cache/net-dns/pdns-4.1.13
index 13389caa0759..787d829c71bb 100644
--- a/metadata/md5-cache/net-dns/pdns-4.1.13
+++ b/metadata/md5-cache/net-dns/pdns-4.1.13
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( dev-libs/botan:2= ) lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
 REQUIRED_USE=mydns? ( mysql )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.1.13.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=520dcba650aaff8694af6af1df069081
+_md5_=5c9d89aa136fc02e4e9c1be311d72e82
diff --git a/metadata/md5-cache/net-dns/pdns-4.2.0 b/metadata/md5-cache/net-dns/pdns-4.2.0
index 51072f8681cc..d05afc133cde 100644
--- a/metadata/md5-cache/net-dns/pdns-4.2.0
+++ b/metadata/md5-cache/net-dns/pdns-4.2.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
 REQUIRED_USE=lua-records? ( lua ) mydns? ( mysql )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.2.0.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=3180810ac1e60d518509939f5375aa31
+_md5_=842a53b181d49cab6bdf9860b92ae7f6
diff --git a/metadata/md5-cache/net-dns/pdns-4.2.1 b/metadata/md5-cache/net-dns/pdns-4.2.1
index 00ec3322deb6..738b31fce41c 100644
--- a/metadata/md5-cache/net-dns/pdns-4.2.1
+++ b/metadata/md5-cache/net-dns/pdns-4.2.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
 REQUIRED_USE=lua-records? ( lua ) mydns? ( mysql )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.2.1.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=3180810ac1e60d518509939f5375aa31
+_md5_=842a53b181d49cab6bdf9860b92ae7f6
diff --git a/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1 b/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1
index 96d20c4a1015..03f44dad469b 100644
--- a/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1
+++ b/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1
@@ -6,7 +6,8 @@ HOMEPAGE=http://members.home.nl/p.a.rombouts/pdnsd/
 IUSE=debug ipv6 isdn +urandom test
 KEYWORDS=alpha amd64 arm ia64 ppc ~s390 sparc x86
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=f3f586533fe747816e73891a30612fcd
+_md5_=6358425f364c6b9464954fa84af66570
diff --git a/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r2 b/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r2
index c6ab24ab951c..95b9aa318c82 100644
--- a/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r2
+++ b/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r2
@@ -8,7 +8,8 @@ IUSE=debug ipv6 isdn +urandom test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=acct-group/pdnsd acct-user/pdnsd
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=11c6913933d525b7495791a65f5f164b
+_md5_=b30009573cdd31c919f0ab37cd9aa8e5
diff --git a/metadata/md5-cache/net-dns/rbldnsd-0.998b b/metadata/md5-cache/net-dns/rbldnsd-0.998b
index a7fb250e7030..86103484927e 100644
--- a/metadata/md5-cache/net-dns/rbldnsd-0.998b
+++ b/metadata/md5-cache/net-dns/rbldnsd-0.998b
@@ -8,7 +8,8 @@ IUSE=ipv6 test zlib
 KEYWORDS=amd64 hppa sparc x86
 LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spamhaus/rbldnsd/archive/0.998b.tar.gz -> rbldnsd-0.998b.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=5ca93fd91fc433d7130f6dde78944a24
+_md5_=8a488fdc095c7b328c9f9df80d04df6b
diff --git a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.4 b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.4
index ade1aaaa7300..953e035f083d 100644
--- a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.4
+++ b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.4
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/resolv_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/resolv_wrapper-1.1.4.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=180f232ff690a4649b2da75687c0e237
+_md5_=7f82d646de94e9ab9e4a55f112047b23
diff --git a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5 b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
index e65a78b414ed..ab8567567da7 100644
--- a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
+++ b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/resolv_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/resolv_wrapper-1.1.5.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4c2137043f95b78889b4a520fe5163e
+_md5_=37efc2152fc419b8bc39680660888461
diff --git a/metadata/md5-cache/net-dns/unbound-1.9.4 b/metadata/md5-cache/net-dns/unbound-1.9.4
index eb8cc7365f25..b2c53264c60c 100644
--- a/metadata/md5-cache/net-dns/unbound-1.9.4
+++ b/metadata/md5-cache/net-dns/unbound-1.9.4
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86
 LICENSE=BSD GPL-2
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.9.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7aa7ac6d7408d64a134ba766ad5a50a5
+_md5_=d61eae302e31c1724a0eaa18b09e22ba
diff --git a/metadata/md5-cache/net-dns/validns-0.8 b/metadata/md5-cache/net-dns/validns-0.8
index 6ad5c005a10d..0ce99b6b5d4c 100644
--- a/metadata/md5-cache/net-dns/validns-0.8
+++ b/metadata/md5-cache/net-dns/validns-0.8
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/judy
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.validns.net/download/validns-0.8.tar.gz
-_md5_=00746dc98705fbb5ca6173d4b51721e0
+_md5_=f53412c2f48c830df7bb6eca970f9fcc
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.3.5-r2 b/metadata/md5-cache/net-fs/cvmfs-2.3.5-r2
index 699f0a316d3e..c861130499e1 100644
--- a/metadata/md5-cache/net-fs/cvmfs-2.3.5-r2
+++ b/metadata/md5-cache/net-fs/cvmfs-2.3.5-r2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-cpp/gtest >=dev-cpp/sparsehash-1.12 dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0 net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-libs/libcap:0= sys-libs/zlib:0= preload? ( >=dev-cpp/tbb-4.4:0=[debug?] ) server? ( >=dev-cpp/tbb-4.4:0=[debug?] dev-python/geoip-python ) app-admin/sudo net-fs/autofs server? ( aufs? ( sys-kernel/aufs-sources ) www-servers/apache )
 REQUIRED_USE=test-programs? ( server )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cvmfs/cvmfs/archive/cvmfs-2.3.5.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60ed1f6cda041954e9844b799ffd5410
+_md5_=5a94ebc984446b6416cb4042532b051e
diff --git a/metadata/md5-cache/net-im/bitlbee-3.5.1 b/metadata/md5-cache/net-im/bitlbee-3.5.1
index e645c48f54d3..1f5ca1ee0b36 100644
--- a/metadata/md5-cache/net-im/bitlbee-3.5.1
+++ b/metadata/md5-cache/net-im/bitlbee-3.5.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) ) virtual/logger xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=|| ( purple xmpp msn oscar ) xmpp? ( !nss ) test? ( plugins )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://get.bitlbee.org/src/bitlbee-3.5.1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ca41e3163331257a0a4ba2ed7b79109b
+_md5_=edaec85380b9eb331261664aa90143d5
diff --git a/metadata/md5-cache/net-im/empathy-3.12.14 b/metadata/md5-cache/net-im/empathy-3.12.14
index d891c90a532a..f17a7036d9f1 100644
--- a/metadata/md5-cache/net-im/empathy-3.12.14
+++ b/metadata/md5-cache/net-im/empathy-3.12.14
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1
 PDEPEND=>=net-im/telepathy-mission-control-5.14
 RDEPEND=>=dev-libs/glib-2.48:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.4:3 x11-libs/pango >=dev-libs/dbus-glib-0.51 >=dev-libs/folks-0.9.5:=[telepathy] dev-libs/libgee:0.8= >=app-crypt/libsecret-0.5 >=media-libs/libcanberra-0.25[gtk3] >=net-libs/webkit-gtk-2.10:4 >=x11-libs/libnotify-0.7:= media-libs/gstreamer:1.0 >=media-libs/clutter-1.10.0:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 media-libs/clutter-gst:3.0 >=media-libs/cogl-1.14:1.0= net-libs/farstream:0.2= >=net-libs/telepathy-farstream-0.6.0:= >=net-libs/telepathy-glib-0.23.2 >=net-im/telepathy-logger-0.8.0:= app-crypt/gcr[gtk] dev-libs/libxml2:2 gnome-base/gsettings-desktop-schemas media-sound/pulseaudio[glib] net-libs/libsoup:2.4 x11-libs/libX11 geolocation? ( >=app-misc/geoclue-2.1:2.0 >=sci-geosciences/geocode-glib-3.10 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1:= ) map? ( >=media-libs/clutter-1.7.14:1.0 >=media-libs/clutter-gtk-0.90.3:1.0 >=media-libs/libchamplain-0.12.1:0.12[gtk] ) spell? ( >=app-text/enchant-1.2 >=app-text/iso-codes-0.35 ) v4l? ( dev-libs/libgudev:= media-plugins/gst-plugins-v4l2:1.0 >=media-video/cheese-3.4:= ) media-libs/gst-plugins-base:1.0 net-im/telepathy-connection-managers !<net-voip/telepathy-rakia-0.7 x11-themes/adwaita-icon-theme gnome? ( gnome-extra/gnome-contacts )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/empathy/3.12/empathy-3.12.14.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8211ce49fdedac5edac95ef6b16938cb
+_md5_=b3f9bddf2411d7b0c14393db50e92206
diff --git a/metadata/md5-cache/net-im/poezio-0.12 b/metadata/md5-cache/net-im/poezio-0.12
index 537fba99d9a8..f7242e3a6281 100644
--- a/metadata/md5-cache/net-im/poezio-0.12
+++ b/metadata/md5-cache/net-im/poezio-0.12
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=ZLIB
 RDEPEND=dev-python/aiodns[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/slixmpp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/poezio/poezio-0.12.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3592bdb930687c001b135797840820b1
+_md5_=2137d1f66efc7351b2a3729297258cc0
diff --git a/metadata/md5-cache/net-im/poezio-9999 b/metadata/md5-cache/net-im/poezio-9999
index e9aef2238824..bcf6047f17c3 100644
--- a/metadata/md5-cache/net-im/poezio-9999
+++ b/metadata/md5-cache/net-im/poezio-9999
@@ -9,6 +9,7 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=dev-python/aiodns[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/slixmpp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e6ec1788c5fe50416e5215767ff4a1a8
+_md5_=96d8187892f13123c425ac698df0dc0c
diff --git a/metadata/md5-cache/net-im/prosody-0.11.2-r1 b/metadata/md5-cache/net-im/prosody-0.11.2-r1
index 6b0855e5b411..14d256f2a540 100644
--- a/metadata/md5-cache/net-im/prosody-0.11.2-r1
+++ b/metadata/md5-cache/net-im/prosody-0.11.2-r1
@@ -8,7 +8,8 @@ IUSE=ipv6 libevent mysql postgres sqlite ssl zlib jit libressl test
 KEYWORDS=amd64 arm x86
 LICENSE=MIT
 RDEPEND=net-im/jabber-base dev-lua/LuaBitOp !jit? ( >=dev-lang/lua-5.1:0 ) jit? ( dev-lang/luajit:2 ) >=net-dns/libidn-1.1:= !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) >=dev-lua/luaexpat-1.3.0 dev-lua/luafilesystem ipv6? ( >=dev-lua/luasocket-3 ) !ipv6? ( dev-lua/luasocket ) libevent? ( >=dev-lua/luaevent-0.4.3 ) mysql? ( dev-lua/luadbi[mysql] ) postgres? ( dev-lua/luadbi[postgres] ) sqlite? ( dev-lua/luadbi[sqlite] ) ssl? ( dev-lua/luasec ) zlib? ( dev-lua/lua-zlib )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://prosody.im/tmp/0.11.2/prosody-0.11.2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7ea108435f383ecfff03a3883e429ad6
+_md5_=d61264a56b3a0db5169f26a85478ee35
diff --git a/metadata/md5-cache/net-im/prosody-0.11.3 b/metadata/md5-cache/net-im/prosody-0.11.3
index a865b04db77d..f1d94cf6c6ff 100644
--- a/metadata/md5-cache/net-im/prosody-0.11.3
+++ b/metadata/md5-cache/net-im/prosody-0.11.3
@@ -8,7 +8,8 @@ IUSE=ipv6 jit libevent libressl mysql postgres sqlite ssl test zlib
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=net-im/jabber-base dev-lua/LuaBitOp !jit? ( >=dev-lang/lua-5.1:0 ) jit? ( dev-lang/luajit:2 ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) >=net-dns/libidn-1.1:= >=dev-lua/luaexpat-1.3.0 dev-lua/luafilesystem !ipv6? ( dev-lua/luasocket ) ipv6? ( >=dev-lua/luasocket-3 ) libevent? ( >=dev-lua/luaevent-0.4.3 ) mysql? ( dev-lua/luadbi[mysql] ) postgres? ( dev-lua/luadbi[postgres] ) sqlite? ( dev-lua/luadbi[sqlite] ) ssl? ( dev-lua/luasec ) zlib? ( dev-lua/lua-zlib )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://prosody.im/downloads/source/prosody-0.11.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=98b7a3a83469c6b4a9cf839e5b36e5bc
+_md5_=4a123ebfd5ad2c503d47ec9617282930
diff --git a/metadata/md5-cache/net-im/qtox-1.16.3 b/metadata/md5-cache/net-im/qtox-1.16.3
index 4bc7f143f449..f86d7760c1b6 100644
--- a/metadata/md5-cache/net-im/qtox-1.16.3
+++ b/metadata/md5-cache/net-im/qtox-1.16.3
@@ -7,7 +7,8 @@ IUSE=notification test X
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[gif,jpeg,png,xcb] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/libexif:= media-libs/openal >=media-video/ffmpeg-2.6.3:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qTox/qTox/archive/v1.16.3.tar.gz -> qTox-1.16.3.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3b2a01d69e5110e82b865b2610ca8bd
+_md5_=32bf0c5787afd64dd9fa0f960bc2bb06
diff --git a/metadata/md5-cache/net-im/qtox-9999 b/metadata/md5-cache/net-im/qtox-9999
index afba5dcf1c7c..63f34c481704 100644
--- a/metadata/md5-cache/net-im/qtox-9999
+++ b/metadata/md5-cache/net-im/qtox-9999
@@ -7,6 +7,7 @@ IUSE=notification test X
 LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[gif,jpeg,png,xcb] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/libexif:= media-libs/openal >=media-video/ffmpeg-2.6.3:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e205ccb89087a15b03583c38a56f4ce0
+_md5_=5eb14596c83eae3813652c739804864f
diff --git a/metadata/md5-cache/net-im/turses-0.2.23 b/metadata/md5-cache/net-im/turses-0.2.23
index 46ca96df03c8..26a204b1fe26 100644
--- a/metadata/md5-cache/net-im/turses-0.2.23
+++ b/metadata/md5-cache/net-im/turses-0.2.23
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alejandrogomez/turses/archive/v0.2.23.tar.gz -> turses-0.2.23.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c1ce52546a405da89739672b510a33c5
+_md5_=44c75b3c50b99a69345f2e3902f937ca
diff --git a/metadata/md5-cache/net-irc/polari-3.30.2 b/metadata/md5-cache/net-irc/polari-3.30.2
index 0f673903b047..e62e1013ee9d 100644
--- a/metadata/md5-cache/net-irc/polari-3.30.2
+++ b/metadata/md5-cache/net-irc/polari-3.30.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.53.90 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] >=net-irc/telepathy-idle-0.2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/polari/3.30/polari-3.30.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c79c882615ac825b624dc0c3cf9ba1d4
+_md5_=f00962a241fd41b49c527974f5bf9734
diff --git a/metadata/md5-cache/net-irc/telepathy-idle-0.2.0-r1 b/metadata/md5-cache/net-irc/telepathy-idle-0.2.0-r1
index 78a79872f953..42af71a4539c 100644
--- a/metadata/md5-cache/net-irc/telepathy-idle-0.2.0-r1
+++ b/metadata/md5-cache/net-irc/telepathy-idle-0.2.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/dbus-glib-0.51 >=dev-libs/glib-2.32:2 >=net-libs/telepathy-glib-0.21 sys-apps/dbus 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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.2.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=52af071ca8b57b5d1802d8efb683be64
+_md5_=716f2f1a9e22f66798f14f8f2f7240f7
diff --git a/metadata/md5-cache/net-irc/znc-1.7.4 b/metadata/md5-cache/net-irc/znc-1.7.4
index e16d01eb09ec..a2cfacc8ea09 100644
--- a/metadata/md5-cache/net-irc/znc-1.7.4
+++ b/metadata/md5-cache/net-irc/znc-1.7.4
@@ -9,7 +9,8 @@ KEYWORDS=amd64 arm x86
 LICENSE=Apache-2.0
 RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) icu )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://znc.in/releases/archive/znc-1.7.4.tar.gz test? ( https://github.com/google/googletest/archive/1.8.1.tar.gz -> gtest-1.8.1.tar.gz )
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b3d10e05bce06842a5aa1863d37982b
+_md5_=d394be4b97063f61edf65a7697410fe3
diff --git a/metadata/md5-cache/net-irc/znc-1.7.5 b/metadata/md5-cache/net-irc/znc-1.7.5
index fc986b084ac5..a7c5f24bdc58 100644
--- a/metadata/md5-cache/net-irc/znc-1.7.5
+++ b/metadata/md5-cache/net-irc/znc-1.7.5
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) icu )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://znc.in/releases/archive/znc-1.7.5.tar.gz test? ( https://github.com/google/googletest/archive/1.8.1.tar.gz -> gtest-1.8.1.tar.gz )
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f2e8456f4862bd23895d5c35d2321d0b
+_md5_=80673367604b3c9b2a1af5369c02674c
diff --git a/metadata/md5-cache/net-irc/znc-9999 b/metadata/md5-cache/net-irc/znc-9999
index cda4e4e94b51..27f9197ba2f4 100644
--- a/metadata/md5-cache/net-irc/znc-9999
+++ b/metadata/md5-cache/net-irc/znc-9999
@@ -9,6 +9,7 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) icu )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f2e8456f4862bd23895d5c35d2321d0b
+_md5_=80673367604b3c9b2a1af5369c02674c
diff --git a/metadata/md5-cache/net-libs/balde-0.1.1 b/metadata/md5-cache/net-libs/balde-0.1.1
index 7a1412c88d83..f8e913bbf8de 100644
--- a/metadata/md5-cache/net-libs/balde-0.1.1
+++ b/metadata/md5-cache/net-libs/balde-0.1.1
@@ -7,6 +7,7 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34 dev-libs/fcgi x11-misc/shared-mime-info
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balde/balde/releases/download/v0.1.1/balde-0.1.1.tar.bz2
-_md5_=b974c67d856f310fcda3f3548bcc8093
+_md5_=c8ae8458999eebce826f1b9d3f595447
diff --git a/metadata/md5-cache/net-libs/balde-markdown-0.1 b/metadata/md5-cache/net-libs/balde-markdown-0.1
index c8970cd11d86..30f6364694a7 100644
--- a/metadata/md5-cache/net-libs/balde-markdown-0.1
+++ b/metadata/md5-cache/net-libs/balde-markdown-0.1
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34 >=net-libs/balde-0.1 app-text/discount
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balde/balde-markdown/releases/download/v0.1/balde-markdown-0.1.tar.bz2
-_md5_=bda3655d704f8599227061760e69af0d
+_md5_=2ddc86e0cd6c23ed736ce966722ee1ac
diff --git a/metadata/md5-cache/net-libs/davix-0.6.7 b/metadata/md5-cache/net-libs/davix-0.6.7
index 281b2a32a469..07d403c14338 100644
--- a/metadata/md5-cache/net-libs/davix-0.6.7
+++ b/metadata/md5-cache/net-libs/davix-0.6.7
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2:2= dev-libs/openssl:0= kernel_linux? ( sys-apps/util-linux )
 REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/0.6.7/davix-0.6.7.tar.gz -> davix-0.6.7.tar
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8022011cdfa1daa6327231147996d67e
+_md5_=a695f11222cf9a5e34e75b1afe7aae97
diff --git a/metadata/md5-cache/net-libs/davix-0.7.3 b/metadata/md5-cache/net-libs/davix-0.7.3
index 811daf8d4418..0143ab6a5e6f 100644
--- a/metadata/md5-cache/net-libs/davix-0.7.3
+++ b/metadata/md5-cache/net-libs/davix-0.7.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2:2= dev-libs/openssl:0= kernel_linux? ( sys-apps/util-linux )
 REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/0.7.3/davix-0.7.3.tar.gz -> davix-0.7.3.tar
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb61f963fcd7013e928ddc02fc5a0341
+_md5_=c5f1ea2ef17e392e353d7f182f6c12f8
diff --git a/metadata/md5-cache/net-libs/davix-0.7.4 b/metadata/md5-cache/net-libs/davix-0.7.4
index d7b02404e045..c9bb596ca904 100644
--- a/metadata/md5-cache/net-libs/davix-0.7.4
+++ b/metadata/md5-cache/net-libs/davix-0.7.4
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2:2= dev-libs/openssl:0= kernel_linux? ( sys-apps/util-linux )
 REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/0.7.4/davix-0.7.4.tar.gz -> davix-0.7.4.tar
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29b9ac6e4d84ec074e229d44e7cd0193
+_md5_=c979c466ba1c18712ef2795a576ae22d
diff --git a/metadata/md5-cache/net-libs/davix-0.7.5 b/metadata/md5-cache/net-libs/davix-0.7.5
index 53526bd9641e..b58416491dc7 100644
--- a/metadata/md5-cache/net-libs/davix-0.7.5
+++ b/metadata/md5-cache/net-libs/davix-0.7.5
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2:2= dev-libs/openssl:0= kernel_linux? ( sys-apps/util-linux )
 REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/0.7.5/davix-0.7.5.tar.gz -> davix-0.7.5.tar
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29b9ac6e4d84ec074e229d44e7cd0193
+_md5_=c979c466ba1c18712ef2795a576ae22d
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.58.0 b/metadata/md5-cache/net-libs/glib-networking-2.58.0
index 4c330bad4d34..da6b54ae117e 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.58.0
+++ b/metadata/md5-cache/net-libs/glib-networking-2.58.0
@@ -7,7 +7,8 @@ IUSE=+gnome +libproxy +ssl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 a
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.55.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/gnutls-3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.58/glib-networking-2.58.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=411555767b95acea8fc1267df57b9261
+_md5_=dcb838e010af2394927e73a2cacddcaf
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.60.3 b/metadata/md5-cache/net-libs/glib-networking-2.60.3
index c8e6bf86b059..08e2aedc32c6 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.60.3
+++ b/metadata/md5-cache/net-libs/glib-networking-2.60.3
@@ -8,7 +8,8 @@ IUSE=+gnome +libproxy +ssl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 a
 KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.55.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/gnutls-3.4.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.60/glib-networking-2.60.3.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=17774766029b238658d2ad6a6762dd16
+_md5_=43265aca31872bde932c81a8e4ef3707
diff --git a/metadata/md5-cache/net-libs/gnet-2.0.8-r2 b/metadata/md5-cache/net-libs/gnet-2.0.8-r2
index 3b4fff95f976..ead310feafa9 100644
--- a/metadata/md5-cache/net-libs/gnet-2.0.8-r2
+++ b/metadata/md5-cache/net-libs/gnet-2.0.8-r2
@@ -7,7 +7,8 @@ IUSE=test debug
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.6:2
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnet/2.0/gnet-2.0.8.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7d8d86f83755e99fbd3bb621ede41b7
+_md5_=6bd40c9d040006f57ca353af53e79eba
diff --git a/metadata/md5-cache/net-libs/google-cloud-cpp-0.2.0-r1 b/metadata/md5-cache/net-libs/google-cloud-cpp-0.2.0-r1
index 2fa9b238e5eb..387773d32237 100644
--- a/metadata/md5-cache/net-libs/google-cloud-cpp-0.2.0-r1
+++ b/metadata/md5-cache/net-libs/google-cloud-cpp-0.2.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/protobuf:= net-misc/curl net-libs/grpc
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v0.2.0.tar.gz -> google-cloud-cpp-0.2.0.tar.gz https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp -> nlohmann-json-3.1.2-json.hpp https://github.com/googleapis/googleapis/archive/79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz -> googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2225d8d4cec660207504478a7067669
+_md5_=2c2c76d2b48e22c9b31bcd30d212d3f7
diff --git a/metadata/md5-cache/net-libs/libdmapsharing-2.9.39 b/metadata/md5-cache/net-libs/libdmapsharing-2.9.39
index 44692b099867..6e68a740e09b 100644
--- a/metadata/md5-cache/net-libs/libdmapsharing-2.9.39
+++ b/metadata/md5-cache/net-libs/libdmapsharing-2.9.39
@@ -7,7 +7,8 @@ IUSE=+introspection test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.36:2 x11-libs/gdk-pixbuf:2 >=net-dns/avahi-0.6[dbus] >=net-libs/libsoup-2.48.0:2.4 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+RESTRICT=!test? ( test )
 SLOT=3.0/2
 SRC_URI=https://www.flyn.org/projects/libdmapsharing/libdmapsharing-2.9.39.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35d855b02642559babc6f94e60ddbd8a
+_md5_=2fd5b197d4321bfc15ad541777bdea5d
diff --git a/metadata/md5-cache/net-libs/libdom-0.3.3-r1 b/metadata/md5-cache/net-libs/libdom-0.3.3-r1
index 6a090d6d894c..9fe956b2e828 100644
--- a/metadata/md5-cache/net-libs/libdom-0.3.3-r1
+++ b/metadata/md5-cache/net-libs/libdom-0.3.3-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~m68k-mint
 LICENSE=MIT
 RDEPEND=>=dev-libs/libparserutils-0.2.1-r1 >=dev-libs/libwapcaplet-0.3.0 >=net-libs/libhubbub-0.3.1-r1 xml? ( expat? ( >=dev-libs/expat-2.1.0-r3 ) !expat? ( >=dev-libs/libxml2-2.9.1-r4 ) )
 REQUIRED_USE=test? ( xml )
+RESTRICT=!test? ( test )
 SLOT=0/0.3.3
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libdom-0.3.3-src.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d2a356396f91108e35c4b271ec88ca7b
+_md5_=bc69519ea22ad35d68b4658ff47faa09
diff --git a/metadata/md5-cache/net-libs/libgadu-1.12.2 b/metadata/md5-cache/net-libs/libgadu-1.12.2
index 31bd57a28164..ab52b9397e78 100644
--- a/metadata/md5-cache/net-libs/libgadu-1.12.2
+++ b/metadata/md5-cache/net-libs/libgadu-1.12.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-l
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/protobuf-c-1.0.0 sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls:0 ) !gnutls? ( >=dev-libs/openssl-0.9.6m:0 ) ) !=net-im/kadu-0.6.0.2 !=net-im/kadu-0.6.0.1
 REQUIRED_USE=gnutls? ( ssl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wojtekka/libgadu/archive/1.12.2.tar.gz -> libgadu-1.12.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e51449ee1e11759c5a06e0598354a69
+_md5_=2830bb536cf064ed7b1d59c4cc572492
diff --git a/metadata/md5-cache/net-libs/libhubbub-0.3.3 b/metadata/md5-cache/net-libs/libhubbub-0.3.3
index 0b0101503eec..de02827f1f81 100644
--- a/metadata/md5-cache/net-libs/libhubbub-0.3.3
+++ b/metadata/md5-cache/net-libs/libhubbub-0.3.3
@@ -7,7 +7,8 @@ IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mi
 KEYWORDS=amd64 arm ~ppc x86 ~m68k-mint
 LICENSE=MIT
 RDEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !net-libs/hubbub
+RESTRICT=!test? ( test )
 SLOT=0/0.3.3
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libhubbub-0.3.3-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.5.tar.gz -> netsurf-buildsystem-1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	netsurf	45009f983cea2d915d6977508b125099	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1306d18e35b878c60c7d29b5360e992e
+_md5_=172824aac9532acad7d40d57bc76c1ef
diff --git a/metadata/md5-cache/net-libs/libhubbub-0.3.5-r1 b/metadata/md5-cache/net-libs/libhubbub-0.3.5-r1
index 385f6c26b72c..c0a9429b0ab9 100644
--- a/metadata/md5-cache/net-libs/libhubbub-0.3.5-r1
+++ b/metadata/md5-cache/net-libs/libhubbub-0.3.5-r1
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~m68k-mint
 LICENSE=MIT
 RDEPEND=>=dev-libs/libparserutils-0.2.1-r1 !net-libs/hubbub
+RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libhubbub-0.3.5-src.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ab4ded5c69f5764918908f973fb3c86b
+_md5_=a76c2351474a53778c5beec4b80f17eb
diff --git a/metadata/md5-cache/net-libs/libisds-0.10.6 b/metadata/md5-cache/net-libs/libisds-0.10.6
index 0a32a9decdbd..8b2c86fedfa8 100644
--- a/metadata/md5-cache/net-libs/libisds-0.10.6
+++ b/metadata/md5-cache/net-libs/libisds-0.10.6
@@ -7,6 +7,7 @@ IUSE=+curl debug nls openssl static-libs test
 KEYWORDS=~amd64 ~mips ~x86
 LICENSE=LGPL-3
 RDEPEND=dev-libs/expat dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) openssl? ( dev-libs/openssl:= ) !openssl? ( app-crypt/gpgme dev-libs/libgcrypt:= ) !openssl? ( >=app-crypt/gnupg-2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpisar.wz.cz/libisds/dist/libisds-0.10.6.tar.xz
-_md5_=ef7bcf0f7fa983f06690a71208207a6b
+_md5_=f4aa0ea60c4fc4bef4b0e22f78794425
diff --git a/metadata/md5-cache/net-libs/libisds-0.10.7 b/metadata/md5-cache/net-libs/libisds-0.10.7
index d79da582f4aa..61f849c21bb1 100644
--- a/metadata/md5-cache/net-libs/libisds-0.10.7
+++ b/metadata/md5-cache/net-libs/libisds-0.10.7
@@ -7,6 +7,7 @@ IUSE=+curl debug nls openssl static-libs test
 KEYWORDS=~amd64 ~mips ~x86
 LICENSE=LGPL-3
 RDEPEND=dev-libs/expat dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) openssl? ( dev-libs/openssl:= ) !openssl? ( app-crypt/gpgme dev-libs/libgcrypt:= ) !openssl? ( >=app-crypt/gnupg-2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpisar.wz.cz/libisds/dist/libisds-0.10.7.tar.xz
-_md5_=ef7bcf0f7fa983f06690a71208207a6b
+_md5_=f4aa0ea60c4fc4bef4b0e22f78794425
diff --git a/metadata/md5-cache/net-libs/libisds-0.10.8 b/metadata/md5-cache/net-libs/libisds-0.10.8
index 596ec6791b8c..a139bf6a5ddc 100644
--- a/metadata/md5-cache/net-libs/libisds-0.10.8
+++ b/metadata/md5-cache/net-libs/libisds-0.10.8
@@ -7,6 +7,7 @@ IUSE=+curl debug nls openssl static-libs test
 KEYWORDS=amd64 ~mips x86
 LICENSE=LGPL-3
 RDEPEND=dev-libs/expat dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) openssl? ( dev-libs/openssl:= ) !openssl? ( app-crypt/gpgme dev-libs/libgcrypt:= ) !openssl? ( >=app-crypt/gnupg-2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpisar.wz.cz/libisds/dist/libisds-0.10.8.tar.xz
-_md5_=7dfee17d12c2883cb09d59cb5bd5b0ec
+_md5_=8eb6c9f9ca9bcb55a8c1a47b4951cade
diff --git a/metadata/md5-cache/net-libs/libisds-9999 b/metadata/md5-cache/net-libs/libisds-9999
index 83e6a6e2e4d5..acc3532c5136 100644
--- a/metadata/md5-cache/net-libs/libisds-9999
+++ b/metadata/md5-cache/net-libs/libisds-9999
@@ -7,6 +7,7 @@ IUSE=+curl debug nls static-libs test
 LICENSE=LGPL-3
 PROPERTIES=live
 RDEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt:0= dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) >=app-crypt/gnupg-2
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=91eaa617367050d9987ffd227e8c758e
+_md5_=5eb526080d3317ba82694a5f6d5376c5
diff --git a/metadata/md5-cache/net-libs/libmbim-1.6.0 b/metadata/md5-cache/net-libs/libmbim-1.6.0
index 6ff257291a33..2c4eb214aaf2 100644
--- a/metadata/md5-cache/net-libs/libmbim-1.6.0
+++ b/metadata/md5-cache/net-libs/libmbim-1.6.0
@@ -7,7 +7,8 @@ IUSE=doc static-libs test
 KEYWORDS=~alpha amd64 arm ~mips x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32 dev-libs/libgudev:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.6.0.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f86d63dacff2629d66e46ea1e4a24160
+_md5_=54f1554a17b800d3521646ff06d19266
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.63 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.63
index d8156cfa2add..b93f72bd7584 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.63
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.63
@@ -7,7 +7,8 @@ IUSE=+epoll messages ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
+RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.63.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=20d8449e494a3c813068554a7f72f1cb
+_md5_=30d32e373ebf82b4637c08fa5d5199f2
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.64 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.64
index e00d24c4da63..3c8f866d27e0 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.64
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.64
@@ -7,7 +7,8 @@ IUSE=+epoll messages ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
+RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.64.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8f2dc0c4c322b2ea5fc1206e9ff619f0
+_md5_=5931f9cf39f6242d18891a1cb1792d52
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.65 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.65
index 30b5e6e74794..54dceb8c6fb4 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.65
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.65
@@ -7,7 +7,8 @@ IUSE=+epoll messages ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
+RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.65.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1ffe295005539acb45cfa40eb3ec1903
+_md5_=bae6fc7d43dcc942e99d4ecebcb2d453
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.66 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.66
index 382c70f8317d..d2193cd4d1e3 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.66
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.66
@@ -7,7 +7,8 @@ IUSE=+epoll messages ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
+RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.66.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8f2dc0c4c322b2ea5fc1206e9ff619f0
+_md5_=5931f9cf39f6242d18891a1cb1792d52
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.67 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.67
index a93bcbecc852..1056b63f126c 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.67
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.67
@@ -7,7 +7,8 @@ IUSE=+epoll ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
+RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.67.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f199a594a4cd63a5ccbe8c48dd2e28ab
+_md5_=d473d82f4e46fb552c03dcf37c245955
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.68 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.68
index 374438eb33ef..95070f4a8c63 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.68
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.68
@@ -7,7 +7,8 @@ IUSE=+epoll ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
+RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.68.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f199a594a4cd63a5ccbe8c48dd2e28ab
+_md5_=d473d82f4e46fb552c03dcf37c245955
diff --git a/metadata/md5-cache/net-libs/libproxy-0.4.13-r2 b/metadata/md5-cache/net-libs/libproxy-0.4.13-r2
index a2ad861b4276..4ce4759784b9 100644
--- a/metadata/md5-cache/net-libs/libproxy-0.4.13-r2
+++ b/metadata/md5-cache/net-libs/libproxy-0.4.13-r2
@@ -9,7 +9,8 @@ LICENSE=LGPL-2.1+
 PDEPEND=networkmanager? ( net-misc/networkmanager )
 RDEPEND=gnome? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mono? ( dev-lang/mono ) networkmanager? ( sys-apps/dbus:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) perl? ( dev-lang/perl:= ) python? ( python_targets_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(-)] ) spidermonkey? ( >=dev-lang/spidermonkey-1.8.5:0= ) webkit? ( net-libs/webkit-gtk:4 ) kde? ( kde-frameworks/kconfig:5 )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libproxy/libproxy/archive/0.4.13.tar.gz -> libproxy-0.4.13.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b17023c6cfa33a32ff17280e62c79db
+_md5_=bb96a0b5b3daa3a6d96a4b985b5dcfd0
diff --git a/metadata/md5-cache/net-libs/libsoup-2.58.2 b/metadata/md5-cache/net-libs/libsoup-2.58.2
index 69b651efb537..6d36ffb49e25 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.58.2
+++ b/metadata/md5-cache/net-libs/libsoup-2.58.2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) samba? ( net-fs/samba )
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.58/libsoup-2.58.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c2e1935a791f7fe954a6ac5b58630520
+_md5_=6382a081ea3d19af930f172eeaef0a07
diff --git a/metadata/md5-cache/net-libs/libsoup-2.62.3 b/metadata/md5-cache/net-libs/libsoup-2.62.3
index 30639bcc2683..62c3141f6240 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.62.3
+++ b/metadata/md5-cache/net-libs/libsoup-2.62.3
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) samba? ( net-fs/samba )
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.62/libsoup-2.62.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b59664fba7e8da809705bc3984a85fc4
+_md5_=c5ff3f1a59ab532c85d12934bb5fc388
diff --git a/metadata/md5-cache/net-libs/libsoup-2.64.2 b/metadata/md5-cache/net-libs/libsoup-2.64.2
index 77b985410d63..d9d61ceb131b 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.64.2
+++ b/metadata/md5-cache/net-libs/libsoup-2.64.2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libpsl-0.20.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) samba? ( net-fs/samba )
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.64/libsoup-2.64.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=273e366759bcab25257f4a7647f922ee
+_md5_=38d6aaf111e6fcf65fa7f0716a01ceec
diff --git a/metadata/md5-cache/net-libs/libsoup-2.66.2 b/metadata/md5-cache/net-libs/libsoup-2.66.2
index bc1afaa32567..244677cda61f 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.66.2
+++ b/metadata/md5-cache/net-libs/libsoup-2.66.2
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libpsl-0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) samba? ( net-fs/samba ) >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.66/libsoup-2.66.2.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e59db51490b7ceca4af04a3af50dfcae
+_md5_=e18f1c755c7d8c4e13c30314bb40a20c
diff --git a/metadata/md5-cache/net-libs/libsoup-2.66.3 b/metadata/md5-cache/net-libs/libsoup-2.66.3
index 9b025935d46f..7e95424c58ab 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.66.3
+++ b/metadata/md5-cache/net-libs/libsoup-2.66.3
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libpsl-0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) samba? ( net-fs/samba ) >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.66/libsoup-2.66.3.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8776d4c708db2384d110b54b57d449e
+_md5_=61a093800f96fad75a17d65e44a44512
diff --git a/metadata/md5-cache/net-libs/libsoup-2.66.4 b/metadata/md5-cache/net-libs/libsoup-2.66.4
index 0b5fde8dcfa3..b28beb6c5407 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.66.4
+++ b/metadata/md5-cache/net-libs/libsoup-2.66.4
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libpsl-0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) samba? ( net-fs/samba ) >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.66/libsoup-2.66.4.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5393940426f5e3280b3b634d92545821
+_md5_=15064f63c8fe7430751e80922a831501
diff --git a/metadata/md5-cache/net-libs/libsrtp-1.6.0 b/metadata/md5-cache/net-libs/libsrtp-1.6.0
index 7827fa21e4e6..4c3623179af2 100644
--- a/metadata/md5-cache/net-libs/libsrtp-1.6.0
+++ b/metadata/md5-cache/net-libs/libsrtp-1.6.0
@@ -7,7 +7,8 @@ IUSE=aesicm console debug doc libressl openssl static-libs syslog test abi_x86_3
 KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=openssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/cisco/libsrtp/archive/v1.6.0.tar.gz -> libsrtp-1.6.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=653aac0b459290235f4f2c2794c5eb09
+_md5_=e9081d3155f50eeb9e2bf981e7c47d9d
diff --git a/metadata/md5-cache/net-libs/libsrtp-1.6.0-r1 b/metadata/md5-cache/net-libs/libsrtp-1.6.0-r1
index f52685a40fba..1cb5a95a3127 100644
--- a/metadata/md5-cache/net-libs/libsrtp-1.6.0-r1
+++ b/metadata/md5-cache/net-libs/libsrtp-1.6.0-r1
@@ -8,7 +8,8 @@ IUSE=aesicm console debug doc libressl openssl static-libs syslog test abi_x86_3
 KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=openssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/cisco/libsrtp/archive/v1.6.0.tar.gz -> libsrtp-1.6.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b52f88f4a8bb40a9bf5a281dc7cf70ef
+_md5_=e362974591a129273a825b697b977971
diff --git a/metadata/md5-cache/net-libs/libsrtp-2.2.0 b/metadata/md5-cache/net-libs/libsrtp-2.2.0
index beba5ebeb505..218eeac40597 100644
--- a/metadata/md5-cache/net-libs/libsrtp-2.2.0
+++ b/metadata/md5-cache/net-libs/libsrtp-2.2.0
@@ -7,7 +7,8 @@ IUSE=aesicm console debug doc libressl openssl static-libs syslog test abi_x86_3
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=openssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
 SLOT=2/1
 SRC_URI=https://github.com/cisco/libsrtp/archive/v2.2.0.tar.gz -> libsrtp-2.2.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e6305ba0d092088d20a6772013bb6c7f
+_md5_=91fbec12aeeea8b9439f666b3881dfbe
diff --git a/metadata/md5-cache/net-libs/libssh-0.9.0 b/metadata/md5-cache/net-libs/libssh-0.9.0
index 7294132dad01..df9ca40e6352 100644
--- a/metadata/md5-cache/net-libs/libssh-0.9.0
+++ b/metadata/md5-cache/net-libs/libssh-0.9.0
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-
 LICENSE=LGPL-2.1
 RDEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls ) test? ( static-libs )
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://www.libssh.org/files/0.9/libssh-0.9.0.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05900f1abee8d730b7fd8f773c9d2176
+_md5_=fe3635a13ffcb5bf80935fa5aa921e73
diff --git a/metadata/md5-cache/net-libs/libtorrent-0.13.7 b/metadata/md5-cache/net-libs/libtorrent-0.13.7
index 8e1f62eb8b2b..3cdd6f62ac0a 100644
--- a/metadata/md5-cache/net-libs/libtorrent-0.13.7
+++ b/metadata/md5-cache/net-libs/libtorrent-0.13.7
@@ -7,7 +7,8 @@ IUSE=debug libressl ssl test
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib >=dev-libs/libsigc++-2.2.2:2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/libtorrent-0.13.7.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b370f1aa99f8490d1779656de150bd87
+_md5_=28847dc5b28a0ebcdf09b27d83e67679
diff --git a/metadata/md5-cache/net-libs/libtorrent-0.13.7-r1 b/metadata/md5-cache/net-libs/libtorrent-0.13.7-r1
index 2c077cdf0a03..9285a527a302 100644
--- a/metadata/md5-cache/net-libs/libtorrent-0.13.7-r1
+++ b/metadata/md5-cache/net-libs/libtorrent-0.13.7-r1
@@ -7,7 +7,8 @@ IUSE=debug libressl ssl test
 KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib >=dev-libs/libsigc++-2.2.2:2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/libtorrent-0.13.7.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f96f5d6de273770b34b3b8d8b9a73800
+_md5_=e745c9f8e9e1f65dab1d55c557841e0f
diff --git a/metadata/md5-cache/net-libs/libtorrent-0.13.8 b/metadata/md5-cache/net-libs/libtorrent-0.13.8
index c9d287ed63d7..5538680fab72 100644
--- a/metadata/md5-cache/net-libs/libtorrent-0.13.8
+++ b/metadata/md5-cache/net-libs/libtorrent-0.13.8
@@ -7,7 +7,8 @@ IUSE=debug libressl ssl test
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/libtorrent-0.13.8.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7dc100b0cdc0ea406c474f2e4eccf770
+_md5_=11ba279d424c7ef597cefc99a6871f8f
diff --git a/metadata/md5-cache/net-libs/loudmouth-1.5.3-r1 b/metadata/md5-cache/net-libs/loudmouth-1.5.3-r1
index 2173e377e0d6..6f40d4e163d6 100644
--- a/metadata/md5-cache/net-libs/loudmouth-1.5.3-r1
+++ b/metadata/md5-cache/net-libs/loudmouth-1.5.3-r1
@@ -7,7 +7,8 @@ IUSE=asyncns ssl openssl static-libs test
 KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.16:2 net-dns/libidn ssl? ( !openssl? ( >=net-libs/gnutls-1.4.0:0= ) openssl? ( dev-libs/openssl:0= ) ) asyncns? ( >=net-libs/libasyncns-0.3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mcabber/loudmouth/archive/1.5.3.tar.gz -> loudmouth-1.5.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=713b31755a8237ad7b69ecb2e4dcc677
+_md5_=a3b4f8ac327584d177a58a22f985199d
diff --git a/metadata/md5-cache/net-libs/loudmouth-1.5.3-r2 b/metadata/md5-cache/net-libs/loudmouth-1.5.3-r2
index 56f7b7bc95d8..614d0cd5d760 100644
--- a/metadata/md5-cache/net-libs/loudmouth-1.5.3-r2
+++ b/metadata/md5-cache/net-libs/loudmouth-1.5.3-r2
@@ -7,7 +7,8 @@ IUSE=asyncns ssl openssl static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.16:2 net-dns/libidn:= ssl? ( !openssl? ( >=net-libs/gnutls-1.4.0:0= ) openssl? ( dev-libs/openssl:0= ) ) asyncns? ( >=net-libs/libasyncns-0.3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mcabber/loudmouth/archive/1.5.3.tar.gz -> loudmouth-1.5.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dc11423f0e24fe62de2eafdbf4323e26
+_md5_=f6f54597a860669fcd1c934d48f851e3
diff --git a/metadata/md5-cache/net-libs/loudmouth-1.5.3-r3 b/metadata/md5-cache/net-libs/loudmouth-1.5.3-r3
index 29f8c4643ea3..4fb8ab31496e 100644
--- a/metadata/md5-cache/net-libs/loudmouth-1.5.3-r3
+++ b/metadata/md5-cache/net-libs/loudmouth-1.5.3-r3
@@ -7,6 +7,7 @@ IUSE=asyncns ssl openssl static-libs test
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.16:2 net-dns/libidn:= ssl? ( !openssl? ( >=net-libs/gnutls-1.4.0:0= ) openssl? ( dev-libs/openssl:0= ) ) asyncns? ( >=net-libs/libasyncns-0.3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mcabber.com/files/loudmouth/loudmouth-1.5.3.tar.bz2
-_md5_=64fa702e7e8212c0d0a1a2a13436a501
+_md5_=0f0baeab054053850e0519979a9fb65b
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.10.0 b/metadata/md5-cache/net-libs/mbedtls-2.10.0
index a457292af4ff..40bab87bd6aa 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.10.0
+++ b/metadata/md5-cache/net-libs/mbedtls-2.10.0
@@ -7,7 +7,8 @@ IUSE=cpu_flags_x86_sse2 doc havege libressl programs test threads zlib abi_x86_3
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.10.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56457b86c302e3dd206e29ada415aadf
+_md5_=7479b83875eda2ab9781e5fa0eb0cd80
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.12.0 b/metadata/md5-cache/net-libs/mbedtls-2.12.0
index ac58a551ab27..bfc172f84ab3 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.12.0
+++ b/metadata/md5-cache/net-libs/mbedtls-2.12.0
@@ -7,7 +7,8 @@ IUSE=cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads z
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=Apache-2.0
 RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.12.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3a93c1e0acfdd775982a888e96c5d01
+_md5_=72ec35bd23174f17d53f471854b89409
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.16.3 b/metadata/md5-cache/net-libs/mbedtls-2.16.3
index 9e4fe9fb8469..591f4b3d3741 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.16.3
+++ b/metadata/md5-cache/net-libs/mbedtls-2.16.3
@@ -8,7 +8,8 @@ IUSE=cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads z
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.3.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c2d4ad209ac9d1111f5755c68b5c310
+_md5_=d5f9b593f8249cec5fb01c202362b267
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.17.0 b/metadata/md5-cache/net-libs/mbedtls-2.17.0
index 909de922f3ec..cfb5eca13d1f 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.17.0
+++ b/metadata/md5-cache/net-libs/mbedtls-2.17.0
@@ -8,7 +8,8 @@ IUSE=cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads z
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.17.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c2d4ad209ac9d1111f5755c68b5c310
+_md5_=d5f9b593f8249cec5fb01c202362b267
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.9.36-r1 b/metadata/md5-cache/net-libs/nativebiginteger-0.9.36-r1
index b51517cd6558..62fb9ad6e5a7 100644
--- a/metadata/md5-cache/net-libs/nativebiginteger-0.9.36-r1
+++ b/metadata/md5-cache/net-libs/nativebiginteger-0.9.36-r1
@@ -7,7 +7,8 @@ IUSE=test elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=dev-libs/gmp:0= virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.i2p2.de/releases/0.9.36/i2psource_0.9.36.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6bf551cc967667d765dae5e2577b4a1d
+_md5_=6ca711278a74ea244b53b4b359e2d2e0
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index eb9488d23118..376bfbe4f71e 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -9,6 +9,7 @@ LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/libuv-1.33.1:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=405cbe47dc8e6ac91a62b2f85ace1cbb
+_md5_=69562c10544b8da507a2f30ac4ac71bb
diff --git a/metadata/md5-cache/net-libs/qxmpp-0.9.3-r2 b/metadata/md5-cache/net-libs/qxmpp-0.9.3-r2
index 5c0c273e81dc..082b4a8e97f4 100644
--- a/metadata/md5-cache/net-libs/qxmpp-0.9.3-r2
+++ b/metadata/md5-cache/net-libs/qxmpp-0.9.3-r2
@@ -7,7 +7,8 @@ IUSE=debug doc opus +speex test theora vpx
 KEYWORDS=amd64 x86 ~amd64-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 opus? ( media-libs/opus ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vpx? ( media-libs/libvpx:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qxmpp-project/qxmpp/archive/v0.9.3.tar.gz -> qxmpp-0.9.3.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9c9113571029e1c0c608434bf42a9ae2
+_md5_=8950d0aa19a63eb6e422914c1c96e46d
diff --git a/metadata/md5-cache/net-libs/qxmpp-1.0.1 b/metadata/md5-cache/net-libs/qxmpp-1.0.1
index 5fb4471cb745..a3a447c6ec0a 100644
--- a/metadata/md5-cache/net-libs/qxmpp-1.0.1
+++ b/metadata/md5-cache/net-libs/qxmpp-1.0.1
@@ -8,7 +8,8 @@ IUSE=debug doc opus +speex test theora vpx
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 opus? ( media-libs/opus ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vpx? ( media-libs/libvpx:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qxmpp-project/qxmpp/archive/v1.0.1.tar.gz -> qxmpp-1.0.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c2b4b0eaebf12508052a3e77c386344b
+_md5_=df97b445e8d737a9936a3e100098ca1a
diff --git a/metadata/md5-cache/net-libs/qxmpp-9999 b/metadata/md5-cache/net-libs/qxmpp-9999
index d795cde553fd..2701f39d03cf 100644
--- a/metadata/md5-cache/net-libs/qxmpp-9999
+++ b/metadata/md5-cache/net-libs/qxmpp-9999
@@ -7,6 +7,7 @@ IUSE=debug doc opus +speex test theora vpx
 LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 opus? ( media-libs/opus ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vpx? ( media-libs/libvpx:= )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4f8b3a8220dee2b1a69ca8376f68b800
+_md5_=f2e830a687301d4b61fa8cefac62a37e
diff --git a/metadata/md5-cache/net-libs/rabbitmq-c-0.9.0 b/metadata/md5-cache/net-libs/rabbitmq-c-0.9.0
index 36f2022acbe2..12bd98fb8a33 100644
--- a/metadata/md5-cache/net-libs/rabbitmq-c-0.9.0
+++ b/metadata/md5-cache/net-libs/rabbitmq-c-0.9.0
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ssl? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) tools? ( dev-libs/popt )
 REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/alanxz/rabbitmq-c/archive/v0.9.0.zip -> rabbitmq-c-v0.9.0.zip
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b076b15e656aff4842875d91722e374
+_md5_=ff6af30db75cf712ddeef57a3862d89c
diff --git a/metadata/md5-cache/net-libs/rest-0.8.1 b/metadata/md5-cache/net-libs/rest-0.8.1
index 2f3c705acbd5..e96a08b8f746 100644
--- a/metadata/md5-cache/net-libs/rest-0.8.1
+++ b/metadata/md5-cache/net-libs/rest-0.8.1
@@ -7,7 +7,8 @@ IUSE=+introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips
 KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-misc/ca-certificates >=dev-libs/glib-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libsoup:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+RESTRICT=!test? ( test )
 SLOT=0.7
 SRC_URI=mirror://gnome/sources/rest/0.8/rest-0.8.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3aaa25006effe3c5062a28cfbba7b147
+_md5_=dc762c103c2ef5b8e32d2119e1ea658a
diff --git a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.11 b/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.11
index b60c08c0ea5f..bfe6c9e2e904 100644
--- a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.11
+++ b/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.11
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.sagan/ripe.atlas.sagan-1.1.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e53145aed6c97b41c3ae253271ed8e0d
+_md5_=bc14f58c2274cf7cda62ec9c6181f10c
diff --git a/metadata/md5-cache/net-libs/signon-oauth2-0.24 b/metadata/md5-cache/net-libs/signon-oauth2-0.24
index 1c0421eac5b2..50d2e062ec8e 100644
--- a/metadata/md5-cache/net-libs/signon-oauth2-0.24
+++ b/metadata/md5-cache/net-libs/signon-oauth2-0.24
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] net-libs/signond
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/archive/VERSION_0.24/signon-plugin-oauth2-VERSION_0.24.tar.gz -> signon-oauth2-0.24.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=27ad8b4912081aa95352b5577ac7b9cb
+_md5_=826337bf9181f7e049b1858c04795759
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.1.6 b/metadata/md5-cache/net-libs/socket_wrapper-1.1.6
index d0d01693bb14..a62d8d4a17aa 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.1.6
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.1.6
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/socket_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.1.6.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5cf638d284aa8e3a1cfc03c59e244a79
+_md5_=ac4b3883ebd2c9abfacbfa1a0d959e20
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.1.7 b/metadata/md5-cache/net-libs/socket_wrapper-1.1.7
index 8974466e4f7a..4dabce3c3c91 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.1.7
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.1.7
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/socket_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.1.7.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=044cd2582a0b2a9211c5ee52fe3f68eb
+_md5_=d8682999c21eb9a7b24a2e1787714b4e
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.1.9 b/metadata/md5-cache/net-libs/socket_wrapper-1.1.9
index 69531cea190b..46a7c0316da1 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.1.9
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.1.9
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/socket_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.1.9.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba0e570800cf0bb8a55fdf9c18713345
+_md5_=fcd9e20345d7fa897c814f2da131837f
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.2.1 b/metadata/md5-cache/net-libs/socket_wrapper-1.2.1
index ee4d2d6697c4..4b635c9a5e8e 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.2.1
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.2.1
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/socket_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.2.1.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8770543f8c199b93726f5a7727a95f7b
+_md5_=864dd67eec324e230db73a760cc7909a
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.2.3 b/metadata/md5-cache/net-libs/socket_wrapper-1.2.3
index 91bff48124cd..e47ae710057a 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.2.3
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.2.3
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/socket_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/socket_wrapper-1.2.3.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0165b86926b0f5332b652d6e64139099
+_md5_=05ef129c8e6cd37139cd62899f7b32a3
diff --git a/metadata/md5-cache/net-libs/stem-1.5.4 b/metadata/md5-cache/net-libs/stem-1.5.4
index bc2fcaf2da7a..897e04c60dff 100644
--- a/metadata/md5-cache/net-libs/stem-1.5.4
+++ b/metadata/md5-cache/net-libs/stem-1.5.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
 LICENSE=LGPL-3
 RDEPEND=net-vpn/tor python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.5.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1825eadb921c1432d1ec0507ea93eb35
+_md5_=a7acdf11b8843cb8999bb9ad890ea417
diff --git a/metadata/md5-cache/net-libs/stem-1.6.0 b/metadata/md5-cache/net-libs/stem-1.6.0
index a482ee5e3c8d..539bcee1beb0 100644
--- a/metadata/md5-cache/net-libs/stem-1.6.0
+++ b/metadata/md5-cache/net-libs/stem-1.6.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
 LICENSE=LGPL-3
 RDEPEND=net-vpn/tor python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1825eadb921c1432d1ec0507ea93eb35
+_md5_=a7acdf11b8843cb8999bb9ad890ea417
diff --git a/metadata/md5-cache/net-libs/stem-1.7.0 b/metadata/md5-cache/net-libs/stem-1.7.0
index d2b2b238eab3..2f0db5b22915 100644
--- a/metadata/md5-cache/net-libs/stem-1.7.0
+++ b/metadata/md5-cache/net-libs/stem-1.7.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
 LICENSE=LGPL-3
 RDEPEND=net-vpn/tor python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=649a7bb1f92f2ec39287968704f22a9f
+_md5_=18cd40d1eb6334792a3dbf8466f62cbd
diff --git a/metadata/md5-cache/net-libs/stem-1.7.1 b/metadata/md5-cache/net-libs/stem-1.7.1
index 05bff40959c0..d4e8dd0f8027 100644
--- a/metadata/md5-cache/net-libs/stem-1.7.1
+++ b/metadata/md5-cache/net-libs/stem-1.7.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
 LICENSE=LGPL-3
 RDEPEND=net-vpn/tor python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=649a7bb1f92f2ec39287968704f22a9f
+_md5_=18cd40d1eb6334792a3dbf8466f62cbd
diff --git a/metadata/md5-cache/net-libs/tox-0.2.8 b/metadata/md5-cache/net-libs/tox-0.2.8
index 32b68e180f4f..e1437b89431d 100644
--- a/metadata/md5-cache/net-libs/tox-0.2.8
+++ b/metadata/md5-cache/net-libs/tox-0.2.8
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
 RDEPEND=av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig ) >=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
 REQUIRED_USE=^^ ( no-log log-trace log-debug log-info log-warn log-error )
+RESTRICT=!test? ( test )
 SLOT=0/0.2
 SRC_URI=https://github.com/TokTok/c-toxcore/archive/v0.2.8.tar.gz -> c-toxcore-0.2.8.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=807914875bb79f672255f9aba1322be4
+_md5_=719e3365a347066eb1897017012ffbe0
diff --git a/metadata/md5-cache/net-libs/tox-0.2.9 b/metadata/md5-cache/net-libs/tox-0.2.9
index bed65cf74192..9d62f67d4f8a 100644
--- a/metadata/md5-cache/net-libs/tox-0.2.9
+++ b/metadata/md5-cache/net-libs/tox-0.2.9
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
 RDEPEND=av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig ) >=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
 REQUIRED_USE=?? ( log-debug log-error log-info log-trace log-warn )
+RESTRICT=!test? ( test )
 SLOT=0/0.2
 SRC_URI=https://github.com/TokTok/c-toxcore/archive/v0.2.9.tar.gz -> c-toxcore-0.2.9.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e94a9aa8ca0fc0d86a3b848b2f438f71
+_md5_=0850836c189c874722ada210bea65ff0
diff --git a/metadata/md5-cache/net-libs/tox-0.2.9-r1 b/metadata/md5-cache/net-libs/tox-0.2.9-r1
index 6d545c3abd6b..be7c21bbfc32 100644
--- a/metadata/md5-cache/net-libs/tox-0.2.9-r1
+++ b/metadata/md5-cache/net-libs/tox-0.2.9-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
 RDEPEND=av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig ) >=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
 REQUIRED_USE=?? ( log-debug log-error log-info log-trace log-warn ) daemon? ( dht-node )
+RESTRICT=!test? ( test )
 SLOT=0/0.2
 SRC_URI=https://github.com/TokTok/c-toxcore/archive/v0.2.9.tar.gz -> c-toxcore-0.2.9.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ab98f38e0848b73c5346d0025c6fb42
+_md5_=acaaf1b10502abbec22e5d43efdfdeef
diff --git a/metadata/md5-cache/net-libs/tox-9999 b/metadata/md5-cache/net-libs/tox-9999
index 53dd36966c08..e6383c41a1f3 100644
--- a/metadata/md5-cache/net-libs/tox-9999
+++ b/metadata/md5-cache/net-libs/tox-9999
@@ -9,6 +9,7 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=av? ( media-libs/libvpx media-libs/opus ) daemon? ( acct-group/tox acct-user/tox dev-libs/libconfig ) >=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
 REQUIRED_USE=^^ ( log-debug log-error log-info log-trace log-warn ) daemon? ( dht-node )
+RESTRICT=!test? ( test )
 SLOT=0/0.2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2cc7a29aec62c9894df352e1e9b8dcab
+_md5_=e26c2ce6ddfedf02ac929da8ce0a2a06
diff --git a/metadata/md5-cache/net-libs/wandio-4.2.1 b/metadata/md5-cache/net-libs/wandio-4.2.1
index d38cc3d833f5..e6505ea74873 100644
--- a/metadata/md5-cache/net-libs/wandio-4.2.1
+++ b/metadata/md5-cache/net-libs/wandio-4.2.1
@@ -8,7 +8,8 @@ IUSE=bzip2 http lzma lzo static-libs test zlib
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=!<net-libs/libtrace-4 bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) http? ( net-misc/curl ) zlib? ( sys-libs/zlib )
+RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/wanduow/wandio/archive/4.2.1.tar.gz -> wandio-4.2.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4583ca55e4c9e001337c52c6b3d487c8
+_md5_=47b1c100292aeaf92985dc4963c07c46
diff --git a/metadata/md5-cache/net-libs/xrootd-4.10.1 b/metadata/md5-cache/net-libs/xrootd-4.10.1
index 554132694cd9..767b06768e03 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.10.1
+++ b/metadata/md5-cache/net-libs/xrootd-4.10.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) rbd? ( sys-cluster/ceph ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
 REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.10.1/xrootd-4.10.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cdf84dc4521b385ad6713a3a3b369ecd
+_md5_=72bddc60c4765d8118391a535696bea2
diff --git a/metadata/md5-cache/net-libs/xrootd-4.8.3 b/metadata/md5-cache/net-libs/xrootd-4.8.3
index 0ceb53209e3e..fc842fc073cf 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.8.3
+++ b/metadata/md5-cache/net-libs/xrootd-4.8.3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=!<sci-physics/root-5.32[xrootd] sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rbd? ( sys-cluster/ceph ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
 REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.8.3/xrootd-4.8.3.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6acb467591bf6d836b63c8841a192872
+_md5_=4bebceb2d1a8bee6fef383d22939b72a
diff --git a/metadata/md5-cache/net-libs/xrootd-4.9.0 b/metadata/md5-cache/net-libs/xrootd-4.9.0
index e8d5ff6e4854..4b213e506d3d 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.9.0
+++ b/metadata/md5-cache/net-libs/xrootd-4.9.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=!<sci-physics/root-5.32[xrootd] sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rbd? ( sys-cluster/ceph ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
 REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.9.0/xrootd-4.9.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c6c83eef4bdeb939f1c98e35caa4d049
+_md5_=4cbd7394062c940d69505b27f8a7cb8a
diff --git a/metadata/md5-cache/net-libs/zeromq-2.2.0 b/metadata/md5-cache/net-libs/zeromq-2.2.0
index 45dd212c7f25..d9e6b8f4bbac 100644
--- a/metadata/md5-cache/net-libs/zeromq-2.2.0
+++ b/metadata/md5-cache/net-libs/zeromq-2.2.0
@@ -7,7 +7,8 @@ IUSE=pgm test static-libs
 KEYWORDS=amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=!net-libs/cppzmq
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.zeromq.org/zeromq-2.2.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f0b155f8f017e66b3c86a4e326e2515b
+_md5_=cc46699fd758b7711e8c0cae64e44cb2
diff --git a/metadata/md5-cache/net-libs/zeromq-3.2.5 b/metadata/md5-cache/net-libs/zeromq-3.2.5
index 233a5c4220ce..728cab6de9e0 100644
--- a/metadata/md5-cache/net-libs/zeromq-3.2.5
+++ b/metadata/md5-cache/net-libs/zeromq-3.2.5
@@ -6,7 +6,8 @@ HOMEPAGE=http://www.zeromq.org/
 IUSE=pgm test static-libs elibc_glibc
 KEYWORDS=amd64 arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://download.zeromq.org/zeromq-3.2.5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6c0fadda3ab8c57e422c5c896f1416d1
+_md5_=3b0200ea8a1a800014f7d2e46d9346b7
diff --git a/metadata/md5-cache/net-libs/zeromq-4.3.2 b/metadata/md5-cache/net-libs/zeromq-4.3.2
index 4301d426a14e..bb4450969cc5 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.3.2
+++ b/metadata/md5-cache/net-libs/zeromq-4.3.2
@@ -8,7 +8,8 @@ IUSE=doc drafts pgm +sodium static-libs test unwind elibc_Darwin
 KEYWORDS=amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-3
 RDEPEND=!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) sodium? ( dev-libs/libsodium:= ) pgm? ( =net-libs/openpgm-5.2.122 )
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/zeromq/libzmq/releases/download/v4.3.2/zeromq-4.3.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=99d0a294ae7fab9d9df74c96cd17290f
+_md5_=997d75f80755cdea3a16ce124edcbb95
diff --git a/metadata/md5-cache/net-mail/grepmail-5.30.33-r2 b/metadata/md5-cache/net-mail/grepmail-5.30.33-r2
index feed758b8f60..89f6c125b12c 100644
--- a/metadata/md5-cache/net-mail/grepmail-5.30.33-r2
+++ b/metadata/md5-cache/net-mail/grepmail-5.30.33-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Inline dev-perl/TimeDate dev-perl/Date-Manip virtual/perl-Digest-MD5 >=dev-perl/Mail-Mbox-MessageParser-1.40.01 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/grepmail/grepmail-5.3033.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d796fae438cfd6b912f648cdf1b538df
+_md5_=bf762b06e7bfc43c8f44aa3459b12a77
diff --git a/metadata/md5-cache/net-mail/lbdb-0.47 b/metadata/md5-cache/net-mail/lbdb-0.47
index b901788adb12..1bf3a244680c 100644
--- a/metadata/md5-cache/net-mail/lbdb-0.47
+++ b/metadata/md5-cache/net-mail/lbdb-0.47
@@ -7,6 +7,7 @@ IUSE=abook bbdb crypt evo finger ldap pda test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libvformat evo? ( mail-client/evolution ) finger? ( net-misc/netkit-fingerd ) abook? ( app-misc/abook ) crypt? ( app-crypt/gnupg ) bbdb? ( app-emacs/bbdb ) pda? ( dev-perl/Palm ) ldap? ( dev-perl/perl-ldap )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.spinnaker.de/lbdb/download/lbdb_0.47.tar.gz
-_md5_=e57208d1ac3da8544b0532e198087fb7
+_md5_=519be9c9348087c14d6ec835e8a95760
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.03.03 b/metadata/md5-cache/net-misc/clusterssh-4.03.03
index 569e0ea6d9dc..1d0eb1dda123 100644
--- a/metadata/md5-cache/net-misc/clusterssh-4.03.03
+++ b/metadata/md5-cache/net-misc/clusterssh-4.03.03
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-perl/Test-DistManifest dev-perl/Try-Tiny dev-perl/Tk dev-perl/Config-Simple dev-perl/X11-Protocol dev-perl/XML-Simple x11-apps/xlsfonts x11-terms/xterm dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.01_05.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=628fbdf23c41c044d93a89cfe8f54703
+_md5_=87d6e1e9b0e68258ecaa302c8da55906
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.30.600 b/metadata/md5-cache/net-misc/clusterssh-4.30.600
index 284a29664a05..608ea3f5128b 100644
--- a/metadata/md5-cache/net-misc/clusterssh-4.30.600
+++ b/metadata/md5-cache/net-misc/clusterssh-4.30.600
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-perl/Config-Simple dev-perl/Exception-Class dev-perl/Tk dev-perl/Readonly dev-perl/Test-DistManifest dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-perl/Try-Tiny dev-perl/X11-Protocol dev-perl/XML-Simple x11-apps/xlsfonts x11-terms/xterm dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.03_06.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8e094b9c0b6bfbcd3695557de56ec6a6
+_md5_=ecec2ec5d220c26856d100fc90f12ca0
diff --git a/metadata/md5-cache/net-misc/clusterssh-9999 b/metadata/md5-cache/net-misc/clusterssh-9999
index fdcf9e13ced4..6584217651f7 100644
--- a/metadata/md5-cache/net-misc/clusterssh-9999
+++ b/metadata/md5-cache/net-misc/clusterssh-9999
@@ -7,6 +7,7 @@ IUSE=test
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-perl/Test-DistManifest dev-perl/Try-Tiny dev-perl/Tk dev-perl/Config-Simple dev-perl/X11-Protocol dev-perl/XML-Simple x11-apps/xlsfonts x11-terms/xterm dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-2	3aabf18eba60687bbe6855eba271f688	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6e0003a1f8bea6b3fc54d217655464a2
+_md5_=7e0316da2d56a7552fa0665c7849052b
diff --git a/metadata/md5-cache/net-misc/crossbar-17.12.1 b/metadata/md5-cache/net-misc/crossbar-17.12.1
index d557f910f3aa..284cc58e5d0c 100644
--- a/metadata/md5-cache/net-misc/crossbar-17.12.1
+++ b/metadata/md5-cache/net-misc/crossbar-17.12.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=AGPL-3
 RDEPEND=>=dev-python/attrs-17.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/autobahn-17.10.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bitstring-3.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-6.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/hyper-h2-3.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/idna-2.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/incremental-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/jinja-2.9.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lmdb-0.92[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mistune-0.7.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/priority-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/psutil-5.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-ubjson-0.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sdnotify-0.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-17.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setproctitle-1.1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-36.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/shutilwhich-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/treq-17.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.8.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/watchdog-0.8.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] tor? ( >=dev-python/txtorcon-0.19.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/crossbar/crossbar-17.12.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c133b4b105f86b081ce883f98b18f87f
+_md5_=8be4b9181b0bdec20246a2f5fc31653b
diff --git a/metadata/md5-cache/net-misc/crossbar-17.6.1_p3-r1 b/metadata/md5-cache/net-misc/crossbar-17.6.1_p3-r1
index 1f147d6ffbf3..460698b591a0 100644
--- a/metadata/md5-cache/net-misc/crossbar-17.6.1_p3-r1
+++ b/metadata/md5-cache/net-misc/crossbar-17.6.1_p3-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=AGPL-3
 RDEPEND=>=dev-python/setuptools-36.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-17.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/txaio-2.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyasn1-modules-0.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/incremental-17.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/zope-interface-4.4.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hyper-h2-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/priority-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/service_identity-17.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/autobahn-17.6.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/treq-17.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/click-6.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/attrs-17.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/bitstring-3.1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytrie-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-5.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/py-ubjson-0.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pynacl-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyqrcode-1.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lmdb-0.92[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mistune-0.7.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setproctitle-1.1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sdnotify-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/shutilwhich-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/u-msgpack-2.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/watchdog-0.8.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/crossbar/crossbar-17.6.1.post3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47b637ae7fd762fded6396cfecfb9176
+_md5_=dfa02f1bbd438e51f6d7dd4a876adc2e
diff --git a/metadata/md5-cache/net-misc/crossbar-17.8.1 b/metadata/md5-cache/net-misc/crossbar-17.8.1
index 8df995a1a42d..63f2a58b7e1d 100644
--- a/metadata/md5-cache/net-misc/crossbar-17.8.1
+++ b/metadata/md5-cache/net-misc/crossbar-17.8.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=AGPL-3
 RDEPEND=>=dev-python/attrs-17.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/autobahn-17.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bitstring-3.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-6.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/hyper-h2-3.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/incremental-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/jinja-2.9.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lmdb-0.92[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mistune-0.7.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/priority-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/psutil-5.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-ubjson-0.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sdnotify-0.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-17.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setproctitle-1.1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-36.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/shutilwhich-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/treq-17.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/watchdog-0.8.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] tor? ( >=dev-python/txtorcon-0.19.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/crossbario/crossbar/archive/v17.8.1.tar.gz -> crossbar-17.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32aafee6402ea3577603c3ff4753a9c9
+_md5_=1e2a88ef6277aef842ecb91209655e0e
diff --git a/metadata/md5-cache/net-misc/crossbar-17.9.1 b/metadata/md5-cache/net-misc/crossbar-17.9.1
index 85f1ce40446a..17629e62cc9e 100644
--- a/metadata/md5-cache/net-misc/crossbar-17.9.1
+++ b/metadata/md5-cache/net-misc/crossbar-17.9.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64
 LICENSE=AGPL-3
 RDEPEND=>=dev-python/attrs-17.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/autobahn-17.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bitstring-3.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-6.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/hyper-h2-3.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/idna-2.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/incremental-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/jinja-2.9.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lmdb-0.92[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mistune-0.7.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/priority-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/psutil-5.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-ubjson-0.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sdnotify-0.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-17.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setproctitle-1.1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-36.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/shutilwhich-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/treq-17.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.8.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/watchdog-0.8.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] tor? ( >=dev-python/txtorcon-0.19.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/crossbar/crossbar-17.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9ea974204b2643b3e91dd552fdf2c82
+_md5_=299873b471a188cd4eac4374a652d520
diff --git a/metadata/md5-cache/net-misc/crossbar-18.3.1 b/metadata/md5-cache/net-misc/crossbar-18.3.1
index 62fcce6dabb5..68dbcc061a64 100644
--- a/metadata/md5-cache/net-misc/crossbar-18.3.1
+++ b/metadata/md5-cache/net-misc/crossbar-18.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=AGPL-3
 RDEPEND=>=dev-python/attrs-17.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/autobahn-18.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bitstring-3.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-6.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/hyper-h2-3.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/idna-2.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/incremental-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/jinja-2.9.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lmdb-0.92[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mistune-0.7.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/priority-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/psutil-5.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-ubjson-0.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sdnotify-0.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-17.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setproctitle-1.1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-36.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/shutilwhich-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/treq-17.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/watchdog-0.8.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txtorcon-0.19.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/crossbar/crossbar-18.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0658beed8a7a7da97f5626e0e149067e
+_md5_=1eef858e3cff17e7e0a9aa8af62dedb6
diff --git a/metadata/md5-cache/net-misc/csync-0.50.0 b/metadata/md5-cache/net-misc/csync-0.50.0
index da7437330679..5e61e9bfdb94 100644
--- a/metadata/md5-cache/net-misc/csync-0.50.0
+++ b/metadata/md5-cache/net-misc/csync-0.50.0
@@ -7,7 +7,8 @@ IUSE=doc iconv samba +sftp test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-db/sqlite-3.4:3 net-libs/neon[ssl] iconv? ( virtual/libiconv ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) !net-misc/ocsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://open.cryptomilk.org/attachments/download/27/csync-0.50.0.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e611101859bd2a0f7abe8f7238e0d2f3
+_md5_=83a80aa9f13766cd22c2bf653402ccc1
diff --git a/metadata/md5-cache/net-misc/csync-0.50.0-r1 b/metadata/md5-cache/net-misc/csync-0.50.0-r1
index 6435b5cee8fb..606f51c90f10 100644
--- a/metadata/md5-cache/net-misc/csync-0.50.0-r1
+++ b/metadata/md5-cache/net-misc/csync-0.50.0-r1
@@ -7,7 +7,8 @@ IUSE=doc iconv samba +sftp test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-db/sqlite-3.4:3 net-libs/neon[ssl] iconv? ( virtual/libiconv ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) !net-misc/ocsync
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://open.cryptomilk.org/attachments/download/27/csync-0.50.0.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b3e312db97c55a8b305a6559d2037dbe
+_md5_=0cdd247b60be4228cf63201fc92eac4c
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1
index 7a88fa494f17..3b272d87d049 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1
@@ -7,7 +7,8 @@ IUSE=alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav
 KEYWORDS=alpha amd64 arm ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
+RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://pub.freerdp.com/releases/freerdp-2.0.0-rc2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32059bc9a6ff2bbc182c7e9ba4c2c6fe
+_md5_=4bc01912ece2075b3ba093caf3452ffc
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc4 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc4
index 69896b99055e..1464951e5ffa 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc4
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc4
@@ -7,7 +7,8 @@ IUSE=alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav
 KEYWORDS=alpha amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
+RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://pub.freerdp.com/releases/freerdp-2.0.0-rc4.tar.gz https://github.com/FreeRDP/FreeRDP/commit/6931f54fad12eaf46a72c5c02ac05da817ab6b94.patch -> freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3669d4036524a0ca967b3eb6428f027d
+_md5_=c7e425a05831ce10cdbe78c9354637f5
diff --git a/metadata/md5-cache/net-misc/freerdp-9999 b/metadata/md5-cache/net-misc/freerdp-9999
index fbd56fdcb061..929abb6d8623 100644
--- a/metadata/md5-cache/net-misc/freerdp-9999
+++ b/metadata/md5-cache/net-misc/freerdp-9999
@@ -8,6 +8,7 @@ IUSE=alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
+RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9df7ddf0a4c3227baf381bf2b18a9efc
+_md5_=08d591fa67f862d9600d960f15a08984
diff --git a/metadata/md5-cache/net-misc/httpie-1.0.3 b/metadata/md5-cache/net-misc/httpie-1.0.3
index 7bf002fde685..b7488c22189a 100644
--- a/metadata/md5-cache/net-misc/httpie-1.0.3
+++ b/metadata/md5-cache/net-misc/httpie-1.0.3
@@ -9,7 +9,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakubroztocil/httpie/archive/1.0.3.tar.gz -> httpie-1.0.3.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e3af4d213599ef96ffcff9e03365dd1f
+_md5_=fc9e15516bd38a8d33efa559cc59adec
diff --git a/metadata/md5-cache/net-misc/ipv6calc-1.0.0 b/metadata/md5-cache/net-misc/ipv6calc-1.0.0
index 59c6f92fafd7..6be66973b0ed 100644
--- a/metadata/md5-cache/net-misc/ipv6calc-1.0.0
+++ b/metadata/md5-cache/net-misc/ipv6calc-1.0.0
@@ -7,6 +7,7 @@ IUSE=geoip libressl test
 KEYWORDS=~alpha amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pbiering/ipv6calc/archive/1.0.0.tar.gz -> ipv6calc-1.0.0.tar.gz
-_md5_=fc9b19dfbd026ddb56299e9aa2360781
+_md5_=a9cc2a4710d8d260ac5a8a90c1a086a1
diff --git a/metadata/md5-cache/net-misc/ipv6calc-2.1.0 b/metadata/md5-cache/net-misc/ipv6calc-2.1.0
index 27469579c55a..6886ebece0fb 100644
--- a/metadata/md5-cache/net-misc/ipv6calc-2.1.0
+++ b/metadata/md5-cache/net-misc/ipv6calc-2.1.0
@@ -7,6 +7,7 @@ IUSE=geoip libressl test
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) geoip? ( >=dev-libs/geoip-1.4.7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pbiering/ipv6calc/archive/2.1.0.tar.gz -> ipv6calc-2.1.0.tar.gz
-_md5_=94eac9085bdce870e0b2cb29dc8a99f6
+_md5_=14fc840d849f52b22c5e02d3dfde8063
diff --git a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190618 b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190618
index 8ecec5c7c4ab..3dc1e3f21df4 100644
--- a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190618
+++ b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190618
@@ -6,7 +6,8 @@ HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband
 IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=CC-PD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20190618/mobile-broadband-provider-info-20190618.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d3c0e74d3f54f6524cadd7bbe58a4eea
+_md5_=ba4ac7ed6195a29fbd2f22a8c17eae34
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.18.4-r1 b/metadata/md5-cache/net-misc/networkmanager-1.18.4-r1
index f239a12af296..cd19e7e16ad2 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.18.4-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-1.18.4-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
 REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( consolekit elogind systemd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.18/NetworkManager-1.18.4.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c5c79a8f999b6137f8fc03a34d886ac3
+_md5_=62aa15cea089dc94bf23c55aa663db98
diff --git a/metadata/md5-cache/net-misc/nyx-2.0.4 b/metadata/md5-cache/net-misc/nyx-2.0.4
index c31fbf9b0f06..e723a3c44e86 100644
--- a/metadata/md5-cache/net-misc/nyx-2.0.4
+++ b/metadata/md5-cache/net-misc/nyx-2.0.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=net-libs/stem net-vpn/tor python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nyx/nyx-2.0.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b63a981e96ed8436634e8c7996150ad6
+_md5_=bf4aed080e856a12566a44121f99d07e
diff --git a/metadata/md5-cache/net-misc/nyx-2.1.0 b/metadata/md5-cache/net-misc/nyx-2.1.0
index 6d7b7ed3599b..1269e8c3ca4f 100644
--- a/metadata/md5-cache/net-misc/nyx-2.1.0
+++ b/metadata/md5-cache/net-misc/nyx-2.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=net-libs/stem net-vpn/tor python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nyx/nyx-2.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b63a981e96ed8436634e8c7996150ad6
+_md5_=bf4aed080e856a12566a44121f99d07e
diff --git a/metadata/md5-cache/net-misc/openssh-7.5_p1-r4 b/metadata/md5-cache/net-misc/openssh-7.5_p1-r4
index 2b2be9a7f61b..b32c40158888 100644
--- a/metadata/md5-cache/net-misc/openssh-7.5_p1-r4
+++ b/metadata/md5-cache/net-misc/openssh-7.5_p1-r4
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
 REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.5p1.tar.gz mirror://gentoo/openssh-7.4_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.5p1-hpnssh14v12.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.5p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-10.2/openssh-7.5p1+x509-10.2.diff.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9801f83ad3f5610af1fb95b3445d2037
+_md5_=f67f4fd411c7f56c0dd3df137c34031c
diff --git a/metadata/md5-cache/net-misc/quagga-1.2.4 b/metadata/md5-cache/net-misc/quagga-1.2.4
index fb0bcd341b7d..10bea2a3d06d 100644
--- a/metadata/md5-cache/net-misc/quagga-1.2.4
+++ b/metadata/md5-cache/net-misc/quagga-1.2.4
@@ -7,7 +7,8 @@ IUSE=bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam prot
 KEYWORDS=alpha amd64 arm hppa ppc ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2 virtual/tmpfiles
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.2.4.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=049e8252a80effaca5eadb3198ed8101
+_md5_=e266282fe8065c160cf6c0950a0fa34e
diff --git a/metadata/md5-cache/net-misc/radvd-2.14 b/metadata/md5-cache/net-misc/radvd-2.14
index 9aaa0ed39541..7c1f62373fca 100644
--- a/metadata/md5-cache/net-misc/radvd-2.14
+++ b/metadata/md5-cache/net-misc/radvd-2.14
@@ -7,7 +7,8 @@ IUSE=kernel_FreeBSD selinux test
 KEYWORDS=amd64 arm ~arm64 hppa ppc sparc x86
 LICENSE=BSD
 RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d6b3a803a8c1e0ae22e9296b05a54709
+_md5_=16489d3c5985be664461ce6097e7419a
diff --git a/metadata/md5-cache/net-misc/radvd-2.17-r1 b/metadata/md5-cache/net-misc/radvd-2.17-r1
index 99d13396157f..e9b9c6681936 100644
--- a/metadata/md5-cache/net-misc/radvd-2.17-r1
+++ b/metadata/md5-cache/net-misc/radvd-2.17-r1
@@ -7,7 +7,8 @@ IUSE=kernel_FreeBSD selinux test
 KEYWORDS=amd64 arm ~arm64 hppa ppc sparc x86
 LICENSE=BSD
 RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e279f643290fbfee7e29599b7a7e3fa
+_md5_=437d5b197bd487eef5c0c5d476431649
diff --git a/metadata/md5-cache/net-misc/radvd-2.17-r2 b/metadata/md5-cache/net-misc/radvd-2.17-r2
index 75f4b92995d8..87a6f423c536 100644
--- a/metadata/md5-cache/net-misc/radvd-2.17-r2
+++ b/metadata/md5-cache/net-misc/radvd-2.17-r2
@@ -7,7 +7,8 @@ IUSE=kernel_FreeBSD selinux test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=722cc8c5b49dc9cd2e9ebc66d833ed8d
+_md5_=a2b4d149323b4407579f75c3ff3ecb0f
diff --git a/metadata/md5-cache/net-misc/radvd-2.18 b/metadata/md5-cache/net-misc/radvd-2.18
index 96d4e9243c9a..85f708b9252d 100644
--- a/metadata/md5-cache/net-misc/radvd-2.18
+++ b/metadata/md5-cache/net-misc/radvd-2.18
@@ -7,7 +7,8 @@ IUSE=kernel_FreeBSD selinux test
 KEYWORDS=amd64 arm arm64 hppa ppc sparc x86
 LICENSE=BSD
 RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.18.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9836524850c04c353097f3a49777895
+_md5_=2f0e3d72de6b99d4c84f7468e70e429e
diff --git a/metadata/md5-cache/net-misc/rygel-0.36.2 b/metadata/md5-cache/net-misc/rygel-0.36.2
index a8fac6f29831..9fe3ad11a6a8 100644
--- a/metadata/md5-cache/net-misc/rygel-0.36.2
+++ b/metadata/md5-cache/net-misc/rygel-0.36.2
@@ -7,7 +7,8 @@ IUSE=X +introspection +sqlite tracker test transcode test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gupnp-dlna-0.9.4:2.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmediaart-0.7:2.0 media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-0.14.15 >=net-libs/gupnp-0.20.14 >=net-libs/gupnp-av-0.12.8 >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( app-misc/tracker:= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) X? ( >=x11-libs/gtk+-3:3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rygel/0.36/rygel-0.36.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e45cfba323221d3cefc58ea4cc087900
+_md5_=ef37afe33373c4ed39bb78122ee90ca8
diff --git a/metadata/md5-cache/net-misc/seafile-client-6.2.11 b/metadata/md5-cache/net-misc/seafile-client-6.2.11
index eec39748da61..d6a77db62bc3 100644
--- a/metadata/md5-cache/net-misc/seafile-client-6.2.11
+++ b/metadata/md5-cache/net-misc/seafile-client-6.2.11
@@ -8,7 +8,8 @@ IUSE=shibboleth test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=net-libs/libsearpc ~net-misc/seafile-6.2.11 dev-libs/libevent dev-libs/jansson dev-libs/openssl:0 dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 shibboleth? ( dev-qt/qtwebengine:5[widgets] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile-client/archive/v6.2.11.tar.gz -> seafile-client-6.2.11.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c276e75eb2b7591657a2e054b2721ccb
+_md5_=7d3b38fd1280b83352305efd1613625c
diff --git a/metadata/md5-cache/net-misc/seafile-client-7.0.2 b/metadata/md5-cache/net-misc/seafile-client-7.0.2
index c7b41b4e6972..85fe4319fc65 100644
--- a/metadata/md5-cache/net-misc/seafile-client-7.0.2
+++ b/metadata/md5-cache/net-misc/seafile-client-7.0.2
@@ -8,7 +8,8 @@ IUSE=shibboleth test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=net-libs/libsearpc ~net-misc/seafile-7.0.2 dev-libs/libevent dev-libs/jansson dev-libs/openssl:0 dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 shibboleth? ( dev-qt/qtwebengine:5[widgets] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile-client/archive/v7.0.2.tar.gz -> seafile-client-7.0.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c08519b0cf03795cd1587f27d1d89053
+_md5_=53b471991bd30a92ae06861a201f6600
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6-r2 b/metadata/md5-cache/net-misc/sks-1.1.6-r2
index 66548eff8161..6dc21a571222 100644
--- a/metadata/md5-cache/net-misc/sks-1.1.6-r2
+++ b/metadata/md5-cache/net-misc/sks-1.1.6-r2
@@ -7,7 +7,8 @@ IUSE=optimize test
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-4.0:= dev-ml/findlib dev-ml/camlp4 dev-ml/cryptokit:0/1.10 sys-libs/db:5.3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.6.tgz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=5e74300c68d8a6ddfb354fe2d8e43134
+_md5_=d1cbed31a62fe92ca849f68356aa9477
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6-r4 b/metadata/md5-cache/net-misc/sks-1.1.6-r4
index 0a4fa22d07dd..b9e0b2e0aaeb 100644
--- a/metadata/md5-cache/net-misc/sks-1.1.6-r4
+++ b/metadata/md5-cache/net-misc/sks-1.1.6-r4
@@ -7,7 +7,8 @@ IUSE=optimize test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= sys-libs/db:5.3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.6.tgz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=f0cf4fbb2fe0124e2262e6a2f8307577
+_md5_=70246936965d6c0f1a90da5e56c49d15
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6-r5 b/metadata/md5-cache/net-misc/sks-1.1.6-r5
index 01353e157a75..bd9271eaec60 100644
--- a/metadata/md5-cache/net-misc/sks-1.1.6-r5
+++ b/metadata/md5-cache/net-misc/sks-1.1.6-r5
@@ -7,7 +7,8 @@ IUSE=optimize test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= sys-libs/db:5.3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.6.tgz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=d2a77c6e7e33223517d52c9898d97879
+_md5_=ccbfcb0138079802aa3f94f0b3326f63
diff --git a/metadata/md5-cache/net-misc/streamlink-0.14.2-r1 b/metadata/md5-cache/net-misc/streamlink-0.14.2-r1
index 99f6175a9e47..9fde7d66284d 100644
--- a/metadata/md5-cache/net-misc/streamlink-0.14.2-r1
+++ b/metadata/md5-cache/net-misc/streamlink-0.14.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2 Apache-2.0
 RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >dev-python/requests-2.17.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python2_7? ( dev-python/backports-shutil_which[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) dev-python/pycountry[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] media-video/rtmpdump virtual/ffmpeg python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/streamlink/streamlink/releases/download/0.14.2/streamlink-0.14.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a50bdef133151d15af9fbd49d0914f4
+_md5_=e8fbcd08d2f589e674b7b75ebbe5023b
diff --git a/metadata/md5-cache/net-misc/streamlink-1.0.0 b/metadata/md5-cache/net-misc/streamlink-1.0.0
index 0f19903b4f42..3fd7881adf2b 100644
--- a/metadata/md5-cache/net-misc/streamlink-1.0.0
+++ b/metadata/md5-cache/net-misc/streamlink-1.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2 Apache-2.0
 RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >dev-python/requests-2.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/urllib3-1.23[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python2_7? ( dev-python/backports-shutil_which[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) dev-python/pycountry[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] media-video/rtmpdump virtual/ffmpeg python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/streamlink/streamlink/releases/download/1.0.0/streamlink-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ffc7775cf91e112aa77319c74e03c67a
+_md5_=f73d0b3cf61ca45efe9656db8182e640
diff --git a/metadata/md5-cache/net-misc/streamlink-1.1.1 b/metadata/md5-cache/net-misc/streamlink-1.1.1
index 4dabce720112..12fd373731e1 100644
--- a/metadata/md5-cache/net-misc/streamlink-1.1.1
+++ b/metadata/md5-cache/net-misc/streamlink-1.1.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2 Apache-2.0
 RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >dev-python/requests-2.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/urllib3-1.23[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python2_7? ( dev-python/backports-shutil_which[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) dev-python/pycountry[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] media-video/rtmpdump virtual/ffmpeg python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/streamlink/streamlink/releases/download/1.1.1/streamlink-1.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ffc7775cf91e112aa77319c74e03c67a
+_md5_=f73d0b3cf61ca45efe9656db8182e640
diff --git a/metadata/md5-cache/net-misc/streamlink-9999 b/metadata/md5-cache/net-misc/streamlink-9999
index 1ac5efad15a5..5411586e1dc1 100644
--- a/metadata/md5-cache/net-misc/streamlink-9999
+++ b/metadata/md5-cache/net-misc/streamlink-9999
@@ -8,6 +8,7 @@ LICENSE=BSD-2 Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/backports-shutil_which[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pycountry[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-video/rtmpdump virtual/ffmpeg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=847479d93ed283838d5d96e1fc73dae1
+_md5_=2bb8f5e64759ad58c663cb1891422d95
diff --git a/metadata/md5-cache/net-misc/valve-1.0-r1 b/metadata/md5-cache/net-misc/valve-1.0-r1
index abb596598d9e..f6fc6936927b 100644
--- a/metadata/md5-cache/net-misc/valve-1.0-r1
+++ b/metadata/md5-cache/net-misc/valve-1.0-r1
@@ -5,6 +5,7 @@ HOMEPAGE=https://www.fourmilab.ch/webtools/valve/
 IUSE=test doc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.fourmilab.ch/webtools/valve/valve-1.0.tar.gz
-_md5_=85a70e416926d3c55ffc4e9dfc59a2e3
+_md5_=379e4d5fbe0f889f61a7a8d41aca4d7c
diff --git a/metadata/md5-cache/net-nds/389-ds-base-9999 b/metadata/md5-cache/net-nds/389-ds-base-9999
index 0a744a97cc58..e213b5da846d 100644
--- a/metadata/md5-cache/net-nds/389-ds-base-9999
+++ b/metadata/md5-cache/net-nds/389-ds-base-9999
@@ -7,6 +7,7 @@ IUSE=autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise kerber
 LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=sys-libs/db:4.8 >=dev-libs/cyrus-sasl-2.1.19 >=net-analyzer/net-snmp-5.1.2 >=dev-libs/icu-3.4:= >=dev-libs/nss-3.22[utils] dev-libs/nspr >=dev-libs/svrcore-4.1.2 dev-libs/openssl:0= dev-libs/libpcre:3 >=dev-perl/perl-mozldap-1.5.3 dev-perl/NetAddr-IP net-nds/openldap sys-libs/pam sys-libs/zlib dev-libs/libevent dev-util/cmocka kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] ) selinux? ( sec-policy/selinux-dirsrv ) virtual/perl-Time-Local virtual/perl-MIME-Base64
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7df26429af2b382f0b8d5924f6d6639
+_md5_=305e1fa94319c0ab47ef4ec7d766649f
diff --git a/metadata/md5-cache/net-nntp/nzbget-20.0 b/metadata/md5-cache/net-nntp/nzbget-20.0
index 91a458d781aa..1e06fee496ac 100644
--- a/metadata/md5-cache/net-nntp/nzbget-20.0
+++ b/metadata/md5-cache/net-nntp/nzbget-20.0
@@ -8,7 +8,8 @@ IUSE=debug gnutls ncurses +parcheck ssl test zlib
 KEYWORDS=amd64 arm ppc x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0=[-bindist] ) ) zlib? ( sys-libs/zlib:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nzbget/nzbget/releases/download/v20.0/nzbget-20.0-src.tar.gz -> nzbget-20.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c97f5fdaaef7495bf33a4aaa80de3f2e
+_md5_=53b51df4d54578b564df04c5ed0b3785
diff --git a/metadata/md5-cache/net-nntp/nzbget-21.0 b/metadata/md5-cache/net-nntp/nzbget-21.0
index 1d5b7a7c3b78..5da74c077552 100644
--- a/metadata/md5-cache/net-nntp/nzbget-21.0
+++ b/metadata/md5-cache/net-nntp/nzbget-21.0
@@ -8,7 +8,8 @@ IUSE=debug gnutls ncurses +parcheck ssl test zlib
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0=[-bindist] ) ) zlib? ( sys-libs/zlib:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nzbget/nzbget/releases/download/v21.0/nzbget-21.0-src.tar.gz -> nzbget-21.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=9f9280acd3c8ee4de70b74c6e3c48135
+_md5_=9e0f62f8a55b0259bc90ce1201fac99a
diff --git a/metadata/md5-cache/net-nntp/nzbget-21.0_pre2302 b/metadata/md5-cache/net-nntp/nzbget-21.0_pre2302
index 35575ed35d9d..167d09dd9640 100644
--- a/metadata/md5-cache/net-nntp/nzbget-21.0_pre2302
+++ b/metadata/md5-cache/net-nntp/nzbget-21.0_pre2302
@@ -8,7 +8,8 @@ IUSE=debug gnutls ncurses +parcheck ssl test zlib
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0=[-bindist] ) ) zlib? ( sys-libs/zlib:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nzbget/nzbget/releases/download/v21.0-r2302/nzbget-21.0-testing-r2302-src.tar.gz -> nzbget-21.0_pre2302.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=9f9280acd3c8ee4de70b74c6e3c48135
+_md5_=9e0f62f8a55b0259bc90ce1201fac99a
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.3 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.3
index 55e08d284259..be1f9a958527 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.3
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.3
@@ -7,7 +7,8 @@ IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode t
 KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/bitcoin-leveldb bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) libevent? ( dev-libs/libevent:= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/49e34e288005a5b144a642e197b628396f5a0765.tar.gz -> bitcoin-v0.16.3.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.3.knots20180918/bitcoin-0.16.3.knots20180918.patches.txz -> bitcoin-0.16.3.knots20180918.patches.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6942c2871d30c0262bd4725c93cc4ea
+_md5_=efa76a8237e9fd8c76b1741a2451668b
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.17.1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.17.1
index 081e13c5358b..184fe1e1580e 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.17.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.17.1
@@ -7,7 +7,8 @@ IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde knots libressl +qrcode +system-lev
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 system-leveldb? ( virtual/bitcoin-leveldb ) bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) dev-libs/libevent:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/ef70f9b52b851c7997a9f1a0834714e3eebc1fd8.tar.gz -> bitcoin-v0.17.1.tar.gz https://bitcoinknots.org/files/0.17.x/0.17.1.knots20181229/bitcoin-0.17.1.knots20181229.patches.txz -> bitcoin-0.17.1.knots20181229.patches.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=188bb53f2a6870e60e071847789c818e
+_md5_=1761405f64aef0649aaf08888e2f80f3
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.18.0 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.18.0
index d7c4bd07cc09..a95d1ac48e2e 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.18.0
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.18.0
@@ -7,7 +7,8 @@ IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde knots libressl +qrcode +system-lev
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 system-leveldb? ( virtual/bitcoin-leveldb ) bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) dev-libs/libevent:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/2472733a24a9364e4c6233ccd04166a26a68cc65.tar.gz -> bitcoin-v0.18.0.tar.gz https://bitcoinknots.org/files/0.18.x/0.18.0.knots20190502/bitcoin-0.18.0.knots20190502.patches.txz -> bitcoin-0.18.0.knots20190502.patches.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e268a0021443269d517e62a37ad95629
+_md5_=b3245cd2f083b6e5517cbe0264966a3e
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.16.3 b/metadata/md5-cache/net-p2p/bitcoind-0.16.3
index b81d083ab52c..7c98b5e2c4b9 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.16.3
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.16.3
@@ -7,7 +7,8 @@ IUSE=+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq
 KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= virtual/bitcoin-leveldb !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/49e34e288005a5b144a642e197b628396f5a0765.tar.gz -> bitcoin-v0.16.3.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.3.knots20180918/bitcoin-0.16.3.knots20180918.patches.txz -> bitcoin-0.16.3.knots20180918.patches.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=289e41efb29eea7a3b61b46012aec2a4
+_md5_=75f8ec0b54784d48c722603f193bd31c
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.17.1 b/metadata/md5-cache/net-p2p/bitcoind-0.17.1
index 833cfea4e226..69d06a882c86 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.17.1
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.17.1
@@ -8,7 +8,8 @@ IUSE=+asm +bitcoin_policy_rbf examples knots libressl +system-leveldb test upnp
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= system-leveldb? ( virtual/bitcoin-leveldb ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/ef70f9b52b851c7997a9f1a0834714e3eebc1fd8.tar.gz -> bitcoin-v0.17.1.tar.gz https://bitcoinknots.org/files/0.17.x/0.17.1.knots20181229/bitcoin-0.17.1.knots20181229.patches.txz -> bitcoin-0.17.1.knots20181229.patches.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7e183bcce91f89a8339623946fd1d718
+_md5_=91ae7fd9f3a0fbb1c9623706d14ab55b
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.18.0 b/metadata/md5-cache/net-p2p/bitcoind-0.18.0
index 3b0cbfef960d..d8b77a51278d 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.18.0
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.18.0
@@ -8,7 +8,8 @@ IUSE=+asm +bitcoin_policy_rbf examples knots libressl +system-leveldb test upnp
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= system-leveldb? ( virtual/bitcoin-leveldb ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/2472733a24a9364e4c6233ccd04166a26a68cc65.tar.gz -> bitcoin-v0.18.0.tar.gz https://bitcoinknots.org/files/0.18.x/0.18.0.knots20190502/bitcoin-0.18.0.knots20190502.patches.txz -> bitcoin-0.18.0.knots20190502.patches.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=110d1036f16856599bfa8bbd84acf924
+_md5_=cc956eb61452e0e25370e964bb2417d2
diff --git a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r1 b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r1
index f11c4b295dbc..142ac04dd22a 100644
--- a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r1
+++ b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x8
 LICENSE=MIT GPL-2
 RDEPEND=|| ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/effigies/BitTornado/archive/ed327c4e1ebbe1fe949be81723527cfda87aeb8d.tar.gz -> BitTornado-0.4.1_p20160925.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6407f083c25b254cdcb027d08feb382e
+_md5_=122ea8f30af561aff5dd2c9a627d9ad3
diff --git a/metadata/md5-cache/net-p2p/classified-ads-0.11 b/metadata/md5-cache/net-p2p/classified-ads-0.11
index 56bd3359638c..f1fd14e91a81 100644
--- a/metadata/md5-cache/net-p2p/classified-ads-0.11
+++ b/metadata/md5-cache/net-p2p/classified-ads-0.11
@@ -7,7 +7,8 @@ IUSE=doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:0 >=net-libs/libnatpmp-20130911 <=net-libs/libnatpmp-20140401-r1 >=net-libs/miniupnpc-1.8 sys-apps/file dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 dev-qt/qtsql:5[sqlite] dev-qt/qtmultimedia:5[widgets] dev-qt/qtprintsupport:5 media-libs/opus virtual/libintl
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/operatornormal/classified-ads/archive/0.11.tar.gz -> classified-ads-0.11.tar.gz https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true -> classified-ads-graphics-0.11.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=d7f16110d7fd5d2cc177f440492d2eed
+_md5_=7d989543a84b43721350c7d3c33cc0f6
diff --git a/metadata/md5-cache/net-p2p/classified-ads-0.12 b/metadata/md5-cache/net-p2p/classified-ads-0.12
index 0743e0df8dca..95bd520b6c35 100644
--- a/metadata/md5-cache/net-p2p/classified-ads-0.12
+++ b/metadata/md5-cache/net-p2p/classified-ads-0.12
@@ -7,7 +7,8 @@ IUSE=doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:0 >=net-libs/libnatpmp-20130911 <=net-libs/libnatpmp-20140401-r1 >=net-libs/miniupnpc-1.8 sys-apps/file dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 dev-qt/qtsql:5[sqlite] dev-qt/qtmultimedia:5[widgets] dev-qt/qtprintsupport:5 media-libs/opus virtual/libintl dev-lang/tcl:= dev-lang/tk:= sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/operatornormal/classified-ads/archive/0.12.tar.gz -> classified-ads-0.12.tar.gz https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true -> classified-ads-graphics-0.12.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=48ac9fedf0a44d46ec55edfcc2a12394
+_md5_=60a42b13ec0fc620cee83af3e345483d
diff --git a/metadata/md5-cache/net-p2p/classified-ads-0.13 b/metadata/md5-cache/net-p2p/classified-ads-0.13
index b55bb77ff9ff..93c9ba37b1c7 100644
--- a/metadata/md5-cache/net-p2p/classified-ads-0.13
+++ b/metadata/md5-cache/net-p2p/classified-ads-0.13
@@ -8,7 +8,8 @@ IUSE=doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-arch/bzip2 dev-lang/tcl:= dev-lang/tk:= dev-libs/openssl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/opus net-libs/libnatpmp net-libs/miniupnpc sys-apps/file sys-libs/zlib virtual/libintl
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/operatornormal/classified-ads/archive/0.13.tar.gz -> classified-ads-0.13.tar.gz https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true -> classified-ads-graphics-0.13.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=48da613d6c6b45f0f1dbb21d7be2595b
+_md5_=c0966c91d250c84d11b192f37c82f24e
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.7 b/metadata/md5-cache/net-p2p/rtorrent-0.9.7
index d1b9ced4dcc1..d50a6387755d 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.9.7
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.7
@@ -7,7 +7,8 @@ IUSE=daemon debug selinux test xmlrpc kernel_linux
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=~net-libs/libtorrent-0.13.7 >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl-7.19.1 sys-libs/ncurses:0= xmlrpc? ( dev-libs/xmlrpc-c ) daemon? ( app-misc/screen ) selinux? ( sec-policy/selinux-rtorrent )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/rtorrent-0.9.7.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a9f2e5daf6c0d1719d88350caad42be7
+_md5_=86babbd6f730890f9d2e2aafebc23977
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1 b/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
index 692708cc9ff0..b932880ff2f1 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
@@ -7,7 +7,8 @@ IUSE=daemon debug selinux test xmlrpc kernel_linux
 KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=~net-libs/libtorrent-0.13.7 >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl-7.19.1 sys-libs/ncurses:0= xmlrpc? ( dev-libs/xmlrpc-c ) daemon? ( app-misc/screen ) selinux? ( sec-policy/selinux-rtorrent )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/rtorrent-0.9.7.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=55a6b5a49460ad7d153f0676e71b4438
+_md5_=386fee63cded0483e747c9ad39ec4bd1
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.8 b/metadata/md5-cache/net-p2p/rtorrent-0.9.8
index 31d23a0e6813..f1a5b620dd92 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.9.8
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.8
@@ -7,7 +7,8 @@ IUSE=daemon debug selinux test xmlrpc kernel_linux
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=~net-libs/libtorrent-0.13.8 >=net-misc/curl-7.19.1 sys-libs/ncurses:0= xmlrpc? ( dev-libs/xmlrpc-c ) daemon? ( app-misc/screen ) selinux? ( sec-policy/selinux-rtorrent )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/rtorrent-0.9.8.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e4e90ae6d75a8800c94ed9240bd246d1
+_md5_=d6dc869b555eb1eaa0419ecad43d12d4
diff --git a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1 b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
index 62358b1fc34f..5f09d8662bdc 100644
--- a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
+++ b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Fuuzetsu/torrentinfo/archive/v1.8.6.tar.gz -> torrentinfo-1.8.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=699f3e83ae94df5359e9aa2c03b3cc3c
+_md5_=2763fcab2a7a8e8a2a3a5fb9094a5343
diff --git a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2 b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
index 2ee6fe7a830a..548b7361b398 100644
--- a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
+++ b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Fuuzetsu/torrentinfo/archive/v1.8.6.tar.gz -> torrentinfo-1.8.6.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=004982c8b223049b0ed7fe2f5d02442a
+_md5_=68cdcce9594e9edce600b0417fd96b60
diff --git a/metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0-r1 b/metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0-r1
index 4f642c96ca16..427e7e803e3e 100644
--- a/metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0-r1
+++ b/metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0-r1
@@ -8,7 +8,8 @@ IUSE=test usb_modeswitch
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-print/cups
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.dymo.com/Download%20Drivers/Linux/Download/dymo-cups-drivers-1.4.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bb835ec021d81c7cbfde912fd4edc2a5
+_md5_=b8c56a4ae421478224fec69a44834e26
diff --git a/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1 b/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1
index 02a30c20aff9..a8eaadefa8e1 100644
--- a/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1
+++ b/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm ia64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/tmpfiles
 REQUIRED_USE=test? ( xtinyproxy-header )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tinyproxy/tinyproxy/releases/download/1.10.0/tinyproxy-1.10.0.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=5021c8a62f4951f76dced2be4bb172f1
+_md5_=59328b67280da91150c0ce63969932af
diff --git a/metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r1 b/metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r1
index 5c4d170488c3..575d2d9001ca 100644
--- a/metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r1
+++ b/metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r1
@@ -7,7 +7,8 @@ IUSE=gnutls +jingle libressl plugins test
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.44:2 >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.19.9 dev-libs/libxml2 dev-db/sqlite:3 gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-0.9.8g:0=[-bindist] ) ) jingle? ( >=net-libs/libsoup-2.42 >=net-libs/libnice-0.0.11 ) plugins? ( x11-libs/gtksourceview:3.0[introspection] ) !<net-im/telepathy-mission-control-5.5.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.18.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=58d3ac3c0508bb1ad436d61c2cd7a1c0
+_md5_=babe4c3030598fbb9070733861c5bef0
diff --git a/metadata/md5-cache/net-voip/telepathy-haze-0.8.0-r2 b/metadata/md5-cache/net-voip/telepathy-haze-0.8.0-r2
index 7eb48ddc0bcb..53a89d376a13 100644
--- a/metadata/md5-cache/net-voip/telepathy-haze-0.8.0-r2
+++ b/metadata/md5-cache/net-voip/telepathy-haze-0.8.0-r2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-im/pidgin-2.7[dbus] >=net-libs/telepathy-glib-0.15.1 >=dev-libs/glib-2.30:2 >=dev-libs/dbus-glib-0.73
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze-0.8.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c2d31473cd14338e9b3e512f75d2bbbe
+_md5_=764e062bfaddafadbb0c01bc6ba98426
diff --git a/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0 b/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0
index 09c12fc7e961..5b64ada2f0c7 100644
--- a/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0
+++ b/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.30:2 >=net-libs/sofia-sip-1.12.11 >=net-libs/telepathy-glib-0.17.6 >=sys-apps/dbus-0.60 !net-voip/telepathy-sofiasip
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-rakia/telepathy-rakia-0.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=269b1076fbb4b8af28f8aa5dd5ccd323
+_md5_=6b88d094110c7b81c9bc0f5456aae99c
diff --git a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r2 b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r2
index 232982315058..f6c32e1bcedc 100644
--- a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r2
+++ b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r2
@@ -7,7 +7,8 @@ IUSE=gnutls test
 KEYWORDS=alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/dbus-glib-0.61 dev-libs/libxml2 >=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1.0 >=net-libs/telepathy-glib-0.17.1 >=net-dns/avahi-0.6.22[dbus] net-libs/libsoup:2.4 sys-apps/util-linux dev-db/sqlite:3 gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-0.8.1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=24459694ffdb1faead0367d45490d702
+_md5_=2448a324ea4b8dc4413e2690c4aae0bc
diff --git a/metadata/md5-cache/net-vpn/i2p-0.9.40 b/metadata/md5-cache/net-vpn/i2p-0.9.40
index 4621e9802911..212fca0df4b9 100644
--- a/metadata/md5-cache/net-vpn/i2p-0.9.40
+++ b/metadata/md5-cache/net-vpn/i2p-0.9.40
@@ -7,7 +7,8 @@ IUSE=nls test elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
 RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/commons-logging:0 dev-java/slf4j-simple:0 java-virtuals/servlet-api:3.1 virtual/jre:1.8 net-libs/nativebiginteger:0 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.i2p2.de/releases/0.9.40/i2psource_0.9.40.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0f6e6f50c0d3a56ba395acea45fa4c6f
+_md5_=8328e622287bdd33f7658bbe4ccdf9d6
diff --git a/metadata/md5-cache/net-vpn/iodine-0.7.0-r2 b/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
index 71fe1e1a08db..718c1a2ba1b9 100644
--- a/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
+++ b/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
@@ -7,7 +7,8 @@ IUSE=test kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC GPL-2
 RDEPEND=sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://code.kryo.se/iodine/iodine-0.7.0.tar.gz
 _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_=2ac9e78f1724443f5cf864256279b5d3
+_md5_=3c3f6eb50b598a9fa21ab024bd4c5142
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10
index f1bf686a86e0..36d70e7b088c 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10
+++ b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10
@@ -7,7 +7,8 @@ IUSE=gtk test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0 >=x11-libs/gtk+-3.4:3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.10.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91c011bcdc9b2ec5787d932abaf516a8
+_md5_=1333bf89c69c3c7d097f402e44dfb391
diff --git a/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6 b/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6
index 5fc8e645d98f..385a2906e41c 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6
+++ b/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6
@@ -7,7 +7,8 @@ IUSE=gtk test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-vpn/vpnc-0.5.3_p550 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.6.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dab29650736d9d0a00e7e47c023772ff
+_md5_=6cb82f710d15cadc748fa6b44bc3f9dc
diff --git a/metadata/md5-cache/net-wireless/crackle-9999 b/metadata/md5-cache/net-wireless/crackle-9999
index 0cf3036d0d59..ab410e6ad785 100644
--- a/metadata/md5-cache/net-wireless/crackle-9999
+++ b/metadata/md5-cache/net-wireless/crackle-9999
@@ -7,6 +7,7 @@ IUSE=test
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=net-libs/libpcap
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9df65b72e035704f610e80d42a0628a
+_md5_=acc9fcd16f61aaa1f0dc62f292eed5eb
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5 b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5
index 6e0ebeb3bccd..640b5775975f 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt5? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
+RESTRICT=!test? ( test )
 SLOT=0/3.7.13.5
 SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.7.13.5/gnuradio-3.7.13.5.tar.xz https://dev.gentoo.org/~zerochaos/patches/gnuradio-3.7.13-1-qt5.tar.xz https://dev.gentoo.org/~zerochaos/patches/gnuradio-3.7.13-codec2.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e4c7a45b5dd151e09bc6bb029d65c64
+_md5_=b006922a8de96c122ccab7d5a4ace85c
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.9999 b/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
index 7b2a22fa3387..d8feac754bf3 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
@@ -8,6 +8,7 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) zeromq? ( >=net-libs/zeromq-2.1.11 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
+RESTRICT=!test? ( test )
 SLOT=0/3.7.9999
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=acdd1571b2e04825b74ae9e14dd7a1fb
+_md5_=fb8487f72a7db7085deeba015380ff96
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index 0dd95cf99a4d..d491972db10b 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -8,6 +8,7 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/pygobject:*[cairo(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/qwt:6[qt5(+)] ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-libs/log4cpp ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 dev-libs/gmp:= )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt5? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
+RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d71fd686677bd5cb19afd5b087239cb9
+_md5_=aa3c345ce9531572633fb4c4af300829
diff --git a/metadata/md5-cache/net-wireless/pyrit-0.4.0-r1 b/metadata/md5-cache/net-wireless/pyrit-0.4.0-r1
index 60ba73076798..9b030be1a894 100644
--- a/metadata/md5-cache/net-wireless/pyrit-0.4.0-r1
+++ b/metadata/md5-cache/net-wireless/pyrit-0.4.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=net-analyzer/scapy-2 opencl? ( net-wireless/cpyrit-opencl ) cuda? ( net-wireless/cpyrit-cuda ) 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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JPaulMora/Pyrit/archive/0.4.0.tar.gz -> pyrit-0.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=633c0a7af8aeb2c53a78da93abc1f96b
+_md5_=f0e6ea682e59008ec7e36be881fb510b
diff --git a/metadata/md5-cache/net-wireless/pyrit-0.5.0 b/metadata/md5-cache/net-wireless/pyrit-0.5.0
index b396ccddc937..6a4d1c7429a6 100644
--- a/metadata/md5-cache/net-wireless/pyrit-0.5.0
+++ b/metadata/md5-cache/net-wireless/pyrit-0.5.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=net-analyzer/scapy-2 opencl? ( net-wireless/cpyrit-opencl ) cuda? ( net-wireless/cpyrit-cuda ) 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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JPaulMora/Pyrit/archive/v0.5.0.tar.gz -> pyrit-0.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb4e02f37ef561f16772a01329a9cbff
+_md5_=91f3cda0ffc1215bc9cffe62f71c1d59
diff --git a/metadata/md5-cache/net-wireless/uhd-3.11.0.0 b/metadata/md5-cache/net-wireless/uhd-3.11.0.0
index dc4b9a4ad7f4..2318f2d819b9 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.11.0.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.11.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+RESTRICT=!test? ( test )
 SLOT=0/3.11
 SRC_URI=https://github.com/EttusResearch/uhd/archive/release_003_011_000_000.tar.gz -> EttusResearch-UHD-3.11.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/release_003_011_000_000/uhd_3.11.0.0_images.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ac212cf068afbbd13d99e9fc6f1b12c
+_md5_=5e6fb3fab293e4558ea773546b5ea2ca
diff --git a/metadata/md5-cache/net-wireless/uhd-3.12.0.0 b/metadata/md5-cache/net-wireless/uhd-3.12.0.0
index d143d23b625a..3ed034e5746d 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.12.0.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.12.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+RESTRICT=!test? ( test )
 SLOT=0/3.12
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.12.0.0.tar.gz -> EttusResearch-UHD-3.12.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.12.0.0/uhd-images_3.12.0.0.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c77a8584e45df109c75e0c87a8ae95c9
+_md5_=cb2d7bd36124f68aedcc234abf854bd5
diff --git a/metadata/md5-cache/net-wireless/uhd-3.13.0.1 b/metadata/md5-cache/net-wireless/uhd-3.13.0.1
index 0c98e7de2458..b73d311c30b5 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.13.0.1
+++ b/metadata/md5-cache/net-wireless/uhd-3.13.0.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+RESTRICT=!test? ( test )
 SLOT=0/3.13
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.13.0.1.tar.gz -> EttusResearch-UHD-3.13.0.1.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.13.0.1/uhd-images_3.13.0.1.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c77a8584e45df109c75e0c87a8ae95c9
+_md5_=cb2d7bd36124f68aedcc234abf854bd5
diff --git a/metadata/md5-cache/net-wireless/uhd-3.13.1.0 b/metadata/md5-cache/net-wireless/uhd-3.13.1.0
index 50959e2d831b..5349bcabfd45 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.13.1.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.13.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+RESTRICT=!test? ( test )
 SLOT=0/3.13
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.13.1.0.tar.gz -> EttusResearch-UHD-3.13.1.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.13.1.0/uhd-images_3.13.1.0.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=953f1d01fe8b330cad7ba4d61aeae0ab
+_md5_=bfc713c03b442c1483f1a9ccb13b311d
diff --git a/metadata/md5-cache/net-wireless/uhd-3.14.0.0 b/metadata/md5-cache/net-wireless/uhd-3.14.0.0
index 6d3d76605636..96ec8134a6cd 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.14.0.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.14.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+RESTRICT=!test? ( test )
 SLOT=0/3.14
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.14.0.0.tar.gz -> EttusResearch-UHD-3.14.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.14.0.0/uhd-images_3.14.0.0.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=953f1d01fe8b330cad7ba4d61aeae0ab
+_md5_=bfc713c03b442c1483f1a9ccb13b311d
diff --git a/metadata/md5-cache/net-wireless/uhd-3.14.1.1 b/metadata/md5-cache/net-wireless/uhd-3.14.1.1
index 7bd922a9b126..f4a52cd3d4ec 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.14.1.1
+++ b/metadata/md5-cache/net-wireless/uhd-3.14.1.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+RESTRICT=!test? ( test )
 SLOT=0/3.14.1
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.14.1.1.tar.gz -> EttusResearch-UHD-3.14.1.1.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.14.1.1/uhd-images_3.14.1.1.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f491587163e7298386e502bec5156c61
+_md5_=1dedcd3e652f52833099017b2cfb4e1b
diff --git a/metadata/md5-cache/perl-core/Archive-Tar-2.300.0 b/metadata/md5-cache/perl-core/Archive-Tar-2.300.0
index f05335b642e6..9169d7cc7b9c 100644
--- a/metadata/md5-cache/perl-core/Archive-Tar-2.300.0
+++ b/metadata/md5-cache/perl-core/Archive-Tar-2.300.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-0.820.0 >=virtual/perl-IO-Compress-2.15.0 >=virtual/perl-IO-Zlib-1.10.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.30.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5df17de5b5b38f1e523b78fbfa9a9d36
+_md5_=8832c38b582a4031c3c79c20e8d923b6
diff --git a/metadata/md5-cache/perl-core/CPAN-Meta-2.150.1 b/metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
index 5df822e589ce..650e909e22da 100644
--- a/metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
+++ b/metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
@@ -6,7 +6,8 @@ HOMEPAGE=https://metacpan.org/release/CPAN-Meta
 IUSE=test
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=virtual/perl-CPAN-Meta-YAML-0.8.0 virtual/perl-Carp >=virtual/perl-JSON-PP-2.272.0 >=virtual/perl-Parse-CPAN-Meta-1.441.400 virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.880.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-2.150001.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7d3aca173e8c861cffdefa3368cf30ee
+_md5_=eb1dfd2d46adfd0d1c25d8a87f9cd607
diff --git a/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-7.240.0 b/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-7.240.0
index c3456f10af43..dca8453ed69a 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-7.240.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-7.240.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=virtual/perl-CPAN-Meta-2.143.240 >=virtual/perl-Parse-CPAN-Meta-1.441.400 virtual/perl-Test-Harness
 RDEPEND=>=virtual/perl-ExtUtils-Install-1.520.0 >=virtual/perl-ExtUtils-Manifest-1.700.0 >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.24.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0af4fd5a4ab988c64b372fcfec167fe1
+_md5_=83f54a8b5e98196c5318b142f67a743d
diff --git a/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0 b/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
index 2bb3b2c5ea2c..d5c90e3a640d 100644
--- a/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
+++ b/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://metacpan.org/release/HTTP-Tiny
 IUSE=test
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=virtual/perl-IO virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-Tiny-0.043.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=de17efc86f0566b80059c6fb1868b3b2
+_md5_=18c81db43d12d56a7e4060ce98791656
diff --git a/metadata/md5-cache/perl-core/Math-BigInt-1.999.806 b/metadata/md5-cache/perl-core/Math-BigInt-1.999.806
index 001a5b66f249..996461e37d69 100644
--- a/metadata/md5-cache/perl-core/Math-BigInt-1.999.806
+++ b/metadata/md5-cache/perl-core/Math-BigInt-1.999.806
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=virtual/perl-Math-BigInt-FastCalc-0.270.0 >=virtual/perl-bignum-0.220.0 >=virtual/perl-Math-BigRat-0.260.200
 RDEPEND=>=virtual/perl-Math-Complex-1.390.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999806.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2910947eae9035667b7a7fc88cf115e3
+_md5_=b94c60a29b117d5237b1ebd9bced1c18
diff --git a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.460.0 b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.460.0
index e7bdd6b2fb5d..4750d52ca045 100644
--- a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.460.0
+++ b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.460.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.46.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8aa96017c1f9f67da066480081709bf6
+_md5_=3b336e9cab4ce2f99a2648b5522f37c8
diff --git a/metadata/md5-cache/sci-astronomy/casacore-2.3.0-r1 b/metadata/md5-cache/sci-astronomy/casacore-2.3.0-r1
index 1afcfb8b9298..77330c37cb68 100644
--- a/metadata/md5-cache/sci-astronomy/casacore-2.3.0-r1
+++ b/metadata/md5-cache/sci-astronomy/casacore-2.3.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sci-astronomy/wcslib:0= sci-libs/cfitsio:0= sys-libs/readline:0= virtual/blas:= virtual/lapack:= data? ( sci-astronomy/casa-data ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( sci-libs/hdf5:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/boost:0=[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/casacore/casacore/archive/v2.3.0.tar.gz -> casacore-2.3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db64e5dbd2e4c5d5ad7aa346adb8ee00
+_md5_=83cda1c89d7ae5ac0a669e5a24e9a88f
diff --git a/metadata/md5-cache/sci-astronomy/healpix-3.30 b/metadata/md5-cache/sci-astronomy/healpix-3.30
index 2a6d872cb4e4..1e437cc7b736 100644
--- a/metadata/md5-cache/sci-astronomy/healpix-3.30
+++ b/metadata/md5-cache/sci-astronomy/healpix-3.30
@@ -7,7 +7,8 @@ IUSE=cxx doc idl java openmp static-libs test elibc_FreeBSD java elibc_FreeBSD
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=sci-libs/cfitsio-3 idl? ( dev-lang/gdl sci-astronomy/idlastro ) java? ( >=virtual/jre-1.6:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/healpix/Healpix_3.30/Healpix_3.30_2015Oct08.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c40c9fbaf34285f46d81d62a04c18e28
+_md5_=648ac3c3df576d8148a580ef5034346d
diff --git a/metadata/md5-cache/sci-astronomy/healpix-3.31 b/metadata/md5-cache/sci-astronomy/healpix-3.31
index b425e6f570e3..ddbd8c4a96b3 100644
--- a/metadata/md5-cache/sci-astronomy/healpix-3.31
+++ b/metadata/md5-cache/sci-astronomy/healpix-3.31
@@ -7,7 +7,8 @@ IUSE=cxx doc idl java openmp static-libs test elibc_FreeBSD java elibc_FreeBSD
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=sci-libs/cfitsio-3 idl? ( dev-lang/gdl sci-astronomy/idlastro ) java? ( >=virtual/jre-1.6:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/healpix/Healpix_3.31/Healpix_3.31_2016Aug26.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=25491f4a82489b669c12f3f64a6526ad
+_md5_=63e45e55b48a487a1f45be9d7bc079e2
diff --git a/metadata/md5-cache/sci-astronomy/sextractor-2.19.5 b/metadata/md5-cache/sci-astronomy/sextractor-2.19.5
index 10c4925fedad..4d7b9e10cc22 100644
--- a/metadata/md5-cache/sci-astronomy/sextractor-2.19.5
+++ b/metadata/md5-cache/sci-astronomy/sextractor-2.19.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=modelfit? ( sci-libs/atlas[lapack,threads=] sci-libs/fftw:3.0 )
 REQUIRED_USE=test? ( modelfit )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.astromatic.net/download/sextractor/sextractor-2.19.5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f37cd66c9bc6cf2f8da7d71977c97464
+_md5_=670dcfa898c780b4fd7c753c190bc93d
diff --git a/metadata/md5-cache/sci-astronomy/sextractor-2.19.5-r1 b/metadata/md5-cache/sci-astronomy/sextractor-2.19.5-r1
index 2dee12791fdc..391f97d0e32f 100644
--- a/metadata/md5-cache/sci-astronomy/sextractor-2.19.5-r1
+++ b/metadata/md5-cache/sci-astronomy/sextractor-2.19.5-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!games-misc/sex modelfit? ( sci-libs/atlas[lapack,threads=] sci-libs/fftw:3.0 )
 REQUIRED_USE=test? ( modelfit )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.astromatic.net/download/sextractor/sextractor-2.19.5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=af6a4f8861cd7455d00e6afa9b17c3ab
+_md5_=ab1c061279a11dd40fc5f2b814c34d05
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.19.0 b/metadata/md5-cache/sci-astronomy/stellarium-0.19.0
index 2cd9671669d9..8edc768ba062 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.19.0
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.19.0
@@ -8,7 +8,8 @@ IUSE=debug gps media nls stars test test
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.19.0/stellarium-0.19.0.tar.gz stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0caedaa5a8c871acb3aa693c6bd98c54
+_md5_=2dd49de36deacd113ec364c828c49c06
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.19.1 b/metadata/md5-cache/sci-astronomy/stellarium-0.19.1
index 8bdf8224ab69..d9aea4f8651d 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.19.1
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.19.1
@@ -8,7 +8,8 @@ IUSE=debug gps media nls stars test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.19.1/stellarium-0.19.1.tar.gz stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0efd31907712902ea6ed718e67bb34e3
+_md5_=338a873c3272cbc6c113dfc288671950
diff --git a/metadata/md5-cache/sci-biology/bedtools-2.26.0 b/metadata/md5-cache/sci-biology/bedtools-2.26.0
index ab9a934b865c..cc0e9c5d8db3 100644
--- a/metadata/md5-cache/sci-biology/bedtools-2.26.0
+++ b/metadata/md5-cache/sci-biology/bedtools-2.26.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/arq5x/bedtools2/releases/download/v2.26.0/bedtools-2.26.0.tar.gz https://dev.gentoo.org/~mgorny/dist/bedtools-2.26.0-fix-buildsystem.patch.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93c7c9cb11de4ad32cab7183dc2e6512
+_md5_=e1bd4df60aef5e7f61ab664bcd14cf44
diff --git a/metadata/md5-cache/sci-biology/bfast-0.7.0a b/metadata/md5-cache/sci-biology/bfast-0.7.0a
index 83d539bd0c44..c6653c750ce9 100644
--- a/metadata/md5-cache/sci-biology/bfast-0.7.0a
+++ b/metadata/md5-cache/sci-biology/bfast-0.7.0a
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/XML-Simple
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/bfast/bfast-0.7.0a.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=abc362f15c5107d96bedfb879ea0375f
+_md5_=f752137cf374be5cbb2754f3aa98ad0d
diff --git a/metadata/md5-cache/sci-biology/biopandas-0.2.1 b/metadata/md5-cache/sci-biology/biopandas-0.2.1
index 3c3d56feffdf..cf9869f8cf75 100644
--- a/metadata/md5-cache/sci-biology/biopandas-0.2.1
+++ b/metadata/md5-cache/sci-biology/biopandas-0.2.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/BioPandas/biopandas-0.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a0449fad95f6d2e6b0930487808e8ef
+_md5_=bba68e6e899747c9c8fc7c9b532b6577
diff --git a/metadata/md5-cache/sci-biology/bioperl-network-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-network-1.6.9
index 3640b8f81a3c..7bd5e3163500 100644
--- a/metadata/md5-cache/sci-biology/bioperl-network-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-network-1.6.9
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sci-biology/bioperl-1.6.9 >=dev-perl/Graph-0.86 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-Network-1.006900.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cb366a6a0c6cf3c12320c2d6d3551abe
+_md5_=8f7c4053ffbec76cfad29cca2d99847b
diff --git a/metadata/md5-cache/sci-biology/bioperl-network-9999-r1 b/metadata/md5-cache/sci-biology/bioperl-network-9999-r1
index 41e4ff4b325a..6ec62fbcb2fe 100644
--- a/metadata/md5-cache/sci-biology/bioperl-network-9999-r1
+++ b/metadata/md5-cache/sci-biology/bioperl-network-9999-r1
@@ -7,6 +7,7 @@ IUSE=test
 LICENSE=Artistic GPL-2
 PROPERTIES=live
 RDEPEND=>=sci-biology/bioperl-9999 >=dev-perl/Graph-0.86 dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-2	3aabf18eba60687bbe6855eba271f688	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=025cd5fa89be402f3296160dbf755c8b
+_md5_=0ed6b7039879ff5542d0cf0e44ea6bba
diff --git a/metadata/md5-cache/sci-biology/exonerate-2.2.0-r2 b/metadata/md5-cache/sci-biology/exonerate-2.2.0-r2
index edbf4e0abc78..99442bd02b61 100644
--- a/metadata/md5-cache/sci-biology/exonerate-2.2.0-r2
+++ b/metadata/md5-cache/sci-biology/exonerate-2.2.0-r2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2
 REQUIRED_USE=test? ( utils )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://ftp.ebi.ac.uk/pub/software/vertebrategenomics/exonerate/exonerate-2.2.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2efd53d13e6f08e4144477038f41e4af
+_md5_=05c99b447503c7a3fae4594cd126939a
diff --git a/metadata/md5-cache/sci-biology/fasta-36.3.5e b/metadata/md5-cache/sci-biology/fasta-36.3.5e
index 76683927ab04..1c6b211f5ebe 100644
--- a/metadata/md5-cache/sci-biology/fasta-36.3.5e
+++ b/metadata/md5-cache/sci-biology/fasta-36.3.5e
@@ -6,7 +6,8 @@ HOMEPAGE=https://fasta.bioch.virginia.edu/fasta_www2/fasta_down.shtml
 IUSE=debug cpu_flags_x86_sse2 test
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=fasta
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://faculty.virginia.edu/wrpearson/fasta/fasta36/fasta-36.3.5e.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4eed9011a4fc400bdf3adf77be6c8fe2
+_md5_=84b82aa26369497a27156f525e36590a
diff --git a/metadata/md5-cache/sci-biology/hmmer-2.3.2-r4 b/metadata/md5-cache/sci-biology/hmmer-2.3.2-r4
index 58b40abe2b1b..9bc345ffd85e 100644
--- a/metadata/md5-cache/sci-biology/hmmer-2.3.2-r4
+++ b/metadata/md5-cache/sci-biology/hmmer-2.3.2-r4
@@ -6,6 +6,7 @@ HOMEPAGE=http://hmmer.org/
 IUSE=altivec test threads
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=http://eddylab.org/software/hmmer/2.3.2/hmmer-2.3.2.tar.gz
-_md5_=2f631b79914f25875fd00c05fd144807
+_md5_=e7199c0c0fe31d6c32ec1e285d23d2c8
diff --git a/metadata/md5-cache/sci-biology/hmmer-3.1_beta2 b/metadata/md5-cache/sci-biology/hmmer-3.1_beta2
index c098b0527d7b..0dfc8524d7bb 100644
--- a/metadata/md5-cache/sci-biology/hmmer-3.1_beta2
+++ b/metadata/md5-cache/sci-biology/hmmer-3.1_beta2
@@ -7,6 +7,7 @@ IUSE=altivec cpu_flags_x86_sse gsl mpi test +threads
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=mpi? ( virtual/mpi ) gsl? ( sci-libs/gsl:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://eddylab.org/software/hmmer3/3.1b2/hmmer-3.1b2.tar.gz
-_md5_=e1fda24a135e4e71cdf6ae399f38faea
+_md5_=96e45fe8b653c57b833ec948674bbe69
diff --git a/metadata/md5-cache/sci-biology/psipred-3.4 b/metadata/md5-cache/sci-biology/psipred-3.4
index 1d93b6b6c9d2..c1c044c6a714 100644
--- a/metadata/md5-cache/sci-biology/psipred-3.4
+++ b/metadata/md5-cache/sci-biology/psipred-3.4
@@ -6,7 +6,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=psipred
 RDEPEND=app-shells/tcsh sci-biology/ncbi-tools sci-biology/update-blastdb
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://bioinf.cs.ucl.ac.uk/downloads/psipred/psipred3.4.tar.gz test? ( http://bioinfadmin.cs.ucl.ac.uk/downloads/psipred/old/data/tdbdata.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=aa07fe12602b4a284c9d8734857542e5
+_md5_=44623bcd0b50824824056739420b4873
diff --git a/metadata/md5-cache/sci-biology/psipred-3.5 b/metadata/md5-cache/sci-biology/psipred-3.5
index 00a62a4e2f93..b4ec14863bfb 100644
--- a/metadata/md5-cache/sci-biology/psipred-3.5
+++ b/metadata/md5-cache/sci-biology/psipred-3.5
@@ -6,7 +6,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=psipred
 RDEPEND=app-shells/tcsh sci-biology/ncbi-tools sci-biology/update-blastdb
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://bioinf.cs.ucl.ac.uk/downloads/psipred/psipred3.5.tar.gz test? ( http://bioinfadmin.cs.ucl.ac.uk/downloads/psipred/old/data/tdbdata.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=aa07fe12602b4a284c9d8734857542e5
+_md5_=44623bcd0b50824824056739420b4873
diff --git a/metadata/md5-cache/sci-biology/seqan-1.4.2-r1 b/metadata/md5-cache/sci-biology/seqan-1.4.2-r1
index ee0f6c106152..629cb48d8a21 100644
--- a/metadata/md5-cache/sci-biology/seqan-1.4.2-r1
+++ b/metadata/md5-cache/sci-biology/seqan-1.4.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-3
 RDEPEND=app-arch/bzip2 sys-libs/zlib
 REQUIRED_USE=cpu_flags_x86_sse4_1
+RESTRICT=!test? ( test )
 SLOT=1.4
 SRC_URI=http://packages.seqan.de/seqan-src/seqan-src-1.4.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b7be060ecec73f1e66596a71b90a92a
+_md5_=1f1cf11ee07a7961e6fa23345e516b65
diff --git a/metadata/md5-cache/sci-biology/seqan-2.2.0-r1 b/metadata/md5-cache/sci-biology/seqan-2.2.0-r1
index d0f8f8d0adeb..ade77db64650 100644
--- a/metadata/md5-cache/sci-biology/seqan-2.2.0-r1
+++ b/metadata/md5-cache/sci-biology/seqan-2.2.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-3
 RDEPEND=app-arch/bzip2 sys-libs/zlib !!sci-biology/seqan:2.0 !!sci-biology/seqan:2.1 !!sci-biology/seqan:2.2
 REQUIRED_USE=cpu_flags_x86_sse4_1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://packages.seqan.de/seqan-src/seqan-src-2.2.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aaf78a04252c5e6c2b92b04c7211b73c
+_md5_=16bcf021b05ae673eb5878cdcefd8d8c
diff --git a/metadata/md5-cache/sci-chemistry/autodock-4.2.6 b/metadata/md5-cache/sci-chemistry/autodock-4.2.6
index 2639970eef49..104c095bfd8a 100644
--- a/metadata/md5-cache/sci-chemistry/autodock-4.2.6
+++ b/metadata/md5-cache/sci-chemistry/autodock-4.2.6
@@ -6,7 +6,8 @@ HOMEPAGE=http://autodock.scripps.edu/
 IUSE=examples openmp test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://autodock.scripps.edu/downloads/autodock-registration/tars/dist426/autodocksuite-4.2.6-src.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=237a416a34f2866e72cbf3f6e1457f06
+_md5_=1f9abcb2039d2207b2bd42046dc50467
diff --git a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1 b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
index 3545fc67ad1c..c3d4511db7a1 100644
--- a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
+++ b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytables[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mdtraj/mdtraj-1.9.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bf8b1c2b5ce3aaa4234b24e222534dbb
+_md5_=20f5e5c59c3ce72333da5edc9db457e6
diff --git a/metadata/md5-cache/sci-chemistry/molequeue-0.9.0 b/metadata/md5-cache/sci-chemistry/molequeue-0.9.0
index 3435d83043d1..6ebb52df69ca 100644
--- a/metadata/md5-cache/sci-chemistry/molequeue-0.9.0
+++ b/metadata/md5-cache/sci-chemistry/molequeue-0.9.0
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 zeromq? ( net-libs/cppzmq:0= )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) server? ( client ) test? ( server )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/molequeue/archive/0.9.0.tar.gz -> molequeue-0.9.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b6ade7835e1504f8599c72d6849d093f
+_md5_=3ef65c2ea193f8263a6ea903ea0a4e0f
diff --git a/metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1 b/metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1
index 8c801b76f83c..57de825a5ead 100644
--- a/metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1
+++ b/metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=sci-chemistry/openbabel-2.2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/molsketch/Molsketch/Beryllium-7%200.4.1/Molsketch-0.4.1-src.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b45b296034ade945ccc335907c045895
+_md5_=280a7845c6b6116048707f030f11ce18
diff --git a/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1 b/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
index acd9203439f5..a347fe81ea64 100644
--- a/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
+++ b/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jjhelmus/nmrglue/releases/download/v0.5/nmrglue-0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1406d1bf136a267f31ab9b536307301
+_md5_=e689b5ffc32234b9fea236ee0f9bfbce
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1 b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1
index ec44885b46ca..fd8ae5212377 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1
@@ -7,7 +7,8 @@ IUSE=doc openmp test wxwidgets
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sci-libs/inchi sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:3.0[X] )
+RESTRICT=!test? ( test )
 SLOT=0/5.0.0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.4.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4caa4d1a535fbb669ff9539f77cd1032
+_md5_=ba8f834e0edd395eb7d110b7fc523a29
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1 b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
index fcd6eab023ec..8750e36704ee 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
@@ -8,7 +8,8 @@ IUSE=doc openmp test wxwidgets
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sci-libs/inchi sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:3.0[X] )
+RESTRICT=!test? ( test )
 SLOT=0/5.0.0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.4.1.tar.gz https://openbabel.org/docs/dev/_static/babel130.png -> openbabel.png
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2fb1f0791ca3793c2942ded1a11304b
+_md5_=1e94f05458e235db1868bf06b8a6c8fd
diff --git a/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2 b/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
index 6016d315252e..8668981fd6b9 100644
--- a/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
+++ b/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
@@ -7,7 +7,8 @@ IUSE=static-libs test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!sci-visualization/extrema virtual/blas virtual/lapack >=sci-libs/libint-1.1.4:1 virtual/fortran
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/psicode/psi-3.4.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5edc91712c391640ba4e48fcb6944fee
+_md5_=6a0832285e9337249119f48636e81f04
diff --git a/metadata/md5-cache/sci-chemistry/relax-4.0.0-r1 b/metadata/md5-cache/sci-chemistry/relax-4.0.0-r1
index bd4f36734e2a..20ac76803887 100644
--- a/metadata/md5-cache/sci-chemistry/relax-4.0.0-r1
+++ b/metadata/md5-cache/sci-chemistry/relax-4.0.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/Numdifftools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-chemistry/molmol sci-chemistry/pymol[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-chemistry/vmd >=sci-libs/bmrblib-1.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=sci-libs/minfx-1.0.11[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-visualization/grace sci-visualization/opendx x11-libs/wxGTK:3.0[X]
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.gna.org/relax/relax-4.0.0.src.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=a93ba0d630c6f9c5966b92003e43adad
+_md5_=424e1528a3c8f2ea65835f117a0640cc
diff --git a/metadata/md5-cache/sci-electronics/gazebo-10.1.0 b/metadata/md5-cache/sci-electronics/gazebo-10.1.0
index 56284c04e16e..98b0898d661a 100644
--- a/metadata/md5-cache/sci-electronics/gazebo-10.1.0
+++ b/metadata/md5-cache/sci-electronics/gazebo-10.1.0
@@ -7,7 +7,8 @@ IUSE=cpu_flags_x86_sse2 libav test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-6.0:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:1= sci-libs/ignition-math:4= net-libs/ignition-transport:4= x11-libs/qwt:6=[qt5(+)]
+RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-10.1.0.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0dd8703967e1c7bb187f7dbc0fdab5eb
+_md5_=36f858c2cad5d5102d08d82d8486df97
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
index 9aad03d57dec..04b677572153 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 arm ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_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(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) ) qt5? ( cxx )
+RESTRICT=!test? ( test )
 SLOT=0/23
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0caa677148e55dac8246d90b01037d8c
+_md5_=a6601760a9168d4fa9acfafdd7fd16c0
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4
index fe13d0a68563..e2f57f138703 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_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(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) ) qt5? ( cxx )
+RESTRICT=!test? ( test )
 SLOT=0/23
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c7287563dd93060f3394e2f1e05c608
+_md5_=74db1790c84ed23008ec52d904aa3c46
diff --git a/metadata/md5-cache/sci-libs/Fiona-1.5.1 b/metadata/md5-cache/sci-libs/Fiona-1.5.1
index 13a59bfcbce5..2f2d64007ca9 100644
--- a/metadata/md5-cache/sci-libs/Fiona-1.5.1
+++ b/metadata/md5-cache/sci-libs/Fiona-1.5.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=sci-libs/gdal-1.8 dev-python/click[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Fiona/Fiona-1.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6838362e5c84e8c986e363231d86290e
+_md5_=13ed3d082142723dca83ad90259a746e
diff --git a/metadata/md5-cache/sci-libs/Fiona-1.7.6 b/metadata/md5-cache/sci-libs/Fiona-1.7.6
index 2814931f006f..5fe70f7b1d00 100644
--- a/metadata/md5-cache/sci-libs/Fiona-1.7.6
+++ b/metadata/md5-cache/sci-libs/Fiona-1.7.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=sci-libs/gdal-1.8 dev-python/click[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Fiona/Fiona-1.7.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7f0096a996c1d49bba24dfacdaab1ec4
+_md5_=fcbd93f0affd35995326358df339a0ad
diff --git a/metadata/md5-cache/sci-libs/Fiona-9999 b/metadata/md5-cache/sci-libs/Fiona-9999
index 6be0cd5680dd..2be3c005cf06 100644
--- a/metadata/md5-cache/sci-libs/Fiona-9999
+++ b/metadata/md5-cache/sci-libs/Fiona-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=sci-libs/gdal-1.8 dev-python/click[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=167665e610e8b5dc35cd79c1cdfce407
+_md5_=1aadbc19d2b4e015412dfe8e2a3515bb
diff --git a/metadata/md5-cache/sci-libs/Rtree-0.8.3_p20180802 b/metadata/md5-cache/sci-libs/Rtree-0.8.3_p20180802
index 757bd9aa0497..a1c3f05c539d 100644
--- a/metadata/md5-cache/sci-libs/Rtree-0.8.3_p20180802
+++ b/metadata/md5-cache/sci-libs/Rtree-0.8.3_p20180802
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/libspatialindex python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Toblerity/rtree/archive/c6437a8ae182cb58aef1d0a4465bfc0c6f75b273.tar.gz -> Rtree-0.8.3_p20180802.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c6a7e5f872123e632ae5834681b55355
+_md5_=8a24cf95c989ba34b58f60b2453cd7ca
diff --git a/metadata/md5-cache/sci-libs/Shapely-1.3.0 b/metadata/md5-cache/sci-libs/Shapely-1.3.0
index 4fb4d4b172d9..1e486ba4fc4d 100644
--- a/metadata/md5-cache/sci-libs/Shapely-1.3.0
+++ b/metadata/md5-cache/sci-libs/Shapely-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=sci-libs/geos-3.1 python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Shapely/Shapely-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03d0335be848e2f6f98911a43b9a2ec3
+_md5_=11ad80f1057d8cbb3fa0303d89761997
diff --git a/metadata/md5-cache/sci-libs/Shapely-1.3.2 b/metadata/md5-cache/sci-libs/Shapely-1.3.2
index 36efdd60c2a1..34f5ac98702f 100644
--- a/metadata/md5-cache/sci-libs/Shapely-1.3.2
+++ b/metadata/md5-cache/sci-libs/Shapely-1.3.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=sci-libs/geos-3.1 python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Shapely/Shapely-1.3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03d0335be848e2f6f98911a43b9a2ec3
+_md5_=11ad80f1057d8cbb3fa0303d89761997
diff --git a/metadata/md5-cache/sci-libs/Shapely-1.5.17 b/metadata/md5-cache/sci-libs/Shapely-1.5.17
index da3895679d17..e638ca45950f 100644
--- a/metadata/md5-cache/sci-libs/Shapely-1.5.17
+++ b/metadata/md5-cache/sci-libs/Shapely-1.5.17
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=sci-libs/geos-3.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Shapely/Shapely-1.5.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75cbeb9b583b6ccc8ef4c00eb03bde48
+_md5_=06574462fe767cb71f2750ff2ddbdd9c
diff --git a/metadata/md5-cache/sci-libs/Shapely-1.5.17-r1 b/metadata/md5-cache/sci-libs/Shapely-1.5.17-r1
index 3844f385fd81..fc9d7f948f61 100644
--- a/metadata/md5-cache/sci-libs/Shapely-1.5.17-r1
+++ b/metadata/md5-cache/sci-libs/Shapely-1.5.17-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=sci-libs/geos-3.3 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Shapely/Shapely-1.5.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24235b070b44ca223780c714485afb91
+_md5_=f8f4f711b1aea219f23fe171caea9282
diff --git a/metadata/md5-cache/sci-libs/Shapely-1.6.4_p2 b/metadata/md5-cache/sci-libs/Shapely-1.6.4_p2
index 573b9e3173cd..c560a61a2dfd 100644
--- a/metadata/md5-cache/sci-libs/Shapely-1.6.4_p2
+++ b/metadata/md5-cache/sci-libs/Shapely-1.6.4_p2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=sci-libs/geos-3.3 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Shapely/Shapely-1.6.4.post2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea83353878e559a5489e09407ab0ac7d
+_md5_=c4b40cb78375144219079d31249e9d2a
diff --git a/metadata/md5-cache/sci-libs/Shapely-9999 b/metadata/md5-cache/sci-libs/Shapely-9999
index 7195dd4fd440..c1b9125c9276 100644
--- a/metadata/md5-cache/sci-libs/Shapely-9999
+++ b/metadata/md5-cache/sci-libs/Shapely-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=sci-libs/geos-3.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56f0237d2f15572f0bd1ec18a58fe3ea
+_md5_=d421aefb8a9e9b0e9583af315398483e
diff --git a/metadata/md5-cache/sci-libs/alglib-3.10.0-r1 b/metadata/md5-cache/sci-libs/alglib-3.10.0-r1
index 3aeb2019a548..e9e6f88aaaff 100644
--- a/metadata/md5-cache/sci-libs/alglib-3.10.0-r1
+++ b/metadata/md5-cache/sci-libs/alglib-3.10.0-r1
@@ -6,7 +6,8 @@ HOMEPAGE=http://www.alglib.net/
 IUSE=test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
+RESTRICT=!test? ( test )
 SLOT=0/3.8
 SRC_URI=http://www.alglib.net/translator/re/alglib-3.10.0.cpp.gpl.tgz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bf7cd093a42c993a27b93aea177bd243
+_md5_=d6aaab98810f17d91a185058d560671d
diff --git a/metadata/md5-cache/sci-libs/armadillo-8.300.2 b/metadata/md5-cache/sci-libs/armadillo-8.300.2
index 4ce845733d59..f37a2d67dc0e 100644
--- a/metadata/md5-cache/sci-libs/armadillo-8.300.2
+++ b/metadata/md5-cache/sci-libs/armadillo-8.300.2
@@ -9,7 +9,8 @@ LICENSE=Apache-2.0
 PDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) hdf5? ( sci-libs/hdf5 ) mkl? ( sci-libs/mkl ) tbb? ( dev-cpp/tbb )
 RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 )
 REQUIRED_USE=test? ( lapack )
+RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=mirror://sourceforge/arma/armadillo-8.300.2.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=965f7ea890d797877e73056bdbcc0e8e
+_md5_=d793ac8b1ed1afd844eecba09b372ba2
diff --git a/metadata/md5-cache/sci-libs/armadillo-9.200.5 b/metadata/md5-cache/sci-libs/armadillo-9.200.5
index 3c312159680b..b423c9b1caa3 100644
--- a/metadata/md5-cache/sci-libs/armadillo-9.200.5
+++ b/metadata/md5-cache/sci-libs/armadillo-9.200.5
@@ -9,7 +9,8 @@ LICENSE=Apache-2.0
 PDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) hdf5? ( sci-libs/hdf5 ) mkl? ( sci-libs/mkl ) tbb? ( dev-cpp/tbb )
 RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 )
 REQUIRED_USE=test? ( lapack )
+RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/arma/armadillo-9.200.5.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=464282581efed9b30d6ee89da5d01bd0
+_md5_=e83acd99f8c25bb76bb4015e76817f47
diff --git a/metadata/md5-cache/sci-libs/armadillo-9.200.6 b/metadata/md5-cache/sci-libs/armadillo-9.200.6
index f1d428076a70..f7a9bac92def 100644
--- a/metadata/md5-cache/sci-libs/armadillo-9.200.6
+++ b/metadata/md5-cache/sci-libs/armadillo-9.200.6
@@ -9,7 +9,8 @@ LICENSE=Apache-2.0
 PDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) hdf5? ( sci-libs/hdf5 ) mkl? ( sci-libs/mkl )
 RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 )
 REQUIRED_USE=test? ( lapack )
+RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/arma/armadillo-9.200.6.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f767c2786d084b219339644b7f4f4ba3
+_md5_=c2d1a8609ef050aedf4abb92f0d8f765
diff --git a/metadata/md5-cache/sci-libs/avogadrolibs-1.91.0_pre20180415 b/metadata/md5-cache/sci-libs/avogadrolibs-1.91.0_pre20180415
index 1c8c39beb534..ddff77e2965c 100644
--- a/metadata/md5-cache/sci-libs/avogadrolibs-1.91.0_pre20180415
+++ b/metadata/md5-cache/sci-libs/avogadrolibs-1.91.0_pre20180415
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2+
 RDEPEND=dev-libs/jsoncpp:= >=sci-chemistry/molequeue-0.7 archive? ( app-arch/libarchive ) hdf5? ( sci-libs/hdf5:= ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/glew:0= virtual/opengl ) vtk? ( sci-libs/vtk[qt5,views] )
 REQUIRED_USE=vtk? ( qt5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/avogadrolibs/archive/606debb5d7c2c4020478264c609f895584fc5e38.tar.gz -> avogadrolibs-1.91.0_pre20180415.tar.gz vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern )
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eea8b5b077f39d44537ff1a2ab900e0f
+_md5_=e4b956eb7b8180edefc27725a3628832
diff --git a/metadata/md5-cache/sci-libs/cantera-2.4.0-r1 b/metadata/md5-cache/sci-libs/cantera-2.4.0-r1
index e0e38c15d0fa..432e6930ad5f 100644
--- a/metadata/md5-cache/sci-libs/cantera-2.4.0-r1
+++ b/metadata/md5-cache/sci-libs/cantera-2.4.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python? ( dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) <sci-libs/sundials-4.0.0:0= fortran? ( virtual/fortran )
 REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Cantera/cantera/archive/v2.4.0.tar.gz -> cantera-2.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	fortran-2	f75a2d9321053acf424991e805f32ede	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=da282907f5dea2038907ac6bc067bfda
+_md5_=49c92de51a4fc3411973c0b7d2be771d
diff --git a/metadata/md5-cache/sci-libs/cantera-2.4.0-r2 b/metadata/md5-cache/sci-libs/cantera-2.4.0-r2
index ae8afc824686..e331de425948 100644
--- a/metadata/md5-cache/sci-libs/cantera-2.4.0-r2
+++ b/metadata/md5-cache/sci-libs/cantera-2.4.0-r2
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python? ( dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) <sci-libs/sundials-5.0.0:0= fortran? ( virtual/fortran )
 REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Cantera/cantera/archive/v2.4.0.tar.gz -> cantera-2.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	fortran-2	f75a2d9321053acf424991e805f32ede	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=84e75cffae5f03a909bc533ff3fb791d
+_md5_=854516240e80c66127cf69f2796292dc
diff --git a/metadata/md5-cache/sci-libs/ceres-solver-1.11.0 b/metadata/md5-cache/sci-libs/ceres-solver-1.11.0
index fccb23bfad28..31f21640d9d7 100644
--- a/metadata/md5-cache/sci-libs/ceres-solver-1.11.0
+++ b/metadata/md5-cache/sci-libs/ceres-solver-1.11.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )
 RDEPEND=dev-cpp/glog[gflags?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cxsparse? ( sci-libs/cxsparse:0= ) lapack? ( virtual/lapack ) sparse? ( sci-libs/amd:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/spqr:0= )
 REQUIRED_USE=test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://ceres-solver.org//ceres-solver-1.11.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba5467c2185d408726748eddaf5e8dcf
+_md5_=1e57fa9495778f95f606ca3bae9f2bcf
diff --git a/metadata/md5-cache/sci-libs/ceres-solver-1.12.0 b/metadata/md5-cache/sci-libs/ceres-solver-1.12.0
index fd6adaec5414..d675b1f3ae5f 100644
--- a/metadata/md5-cache/sci-libs/ceres-solver-1.12.0
+++ b/metadata/md5-cache/sci-libs/ceres-solver-1.12.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )
 RDEPEND=dev-cpp/glog[gflags?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cxsparse? ( sci-libs/cxsparse:0= ) lapack? ( virtual/lapack ) sparse? ( sci-libs/amd:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0=[metis] sci-libs/colamd:0= sci-libs/spqr:0= )
 REQUIRED_USE=test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://ceres-solver.org//ceres-solver-1.12.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4f96c2bfe325b07fa1b874901f6f14e
+_md5_=f2e63294ec7f8ad9d181474f82de2450
diff --git a/metadata/md5-cache/sci-libs/cgnslib-3.3.0 b/metadata/md5-cache/sci-libs/cgnslib-3.3.0
index 819aaeafcba4..09b59a122783 100644
--- a/metadata/md5-cache/sci-libs/cgnslib-3.3.0
+++ b/metadata/md5-cache/sci-libs/cgnslib-3.3.0
@@ -7,7 +7,8 @@ IUSE=doc examples fortran hdf5 legacy mpi static-libs szip test tools
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=hdf5? ( sci-libs/hdf5:=[mpi=,szip=] ) tools? ( dev-lang/tcl:= dev-lang/tk:= x11-libs/libXmu:= virtual/glu virtual/opengl ) fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/CGNS/CGNS/archive/v3.3.0.tar.gz -> cgnslib-3.3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42278891f24431ef1c3607611db338df
+_md5_=a2f8e9ce4eff91038970e9ed4e0850e7
diff --git a/metadata/md5-cache/sci-libs/cgnslib-3.4.0 b/metadata/md5-cache/sci-libs/cgnslib-3.4.0
index d0e0d52ff190..f82f8d24e75c 100644
--- a/metadata/md5-cache/sci-libs/cgnslib-3.4.0
+++ b/metadata/md5-cache/sci-libs/cgnslib-3.4.0
@@ -7,7 +7,8 @@ IUSE=doc examples fortran hdf5 legacy mpi static-libs szip test tools
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=hdf5? ( sci-libs/hdf5:=[mpi=,szip=] ) tools? ( dev-lang/tcl:= dev-lang/tk:= x11-libs/libXmu:= virtual/glu virtual/opengl ) fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/CGNS/CGNS/archive/v3.4.0.tar.gz -> cgnslib-3.4.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c7fa838913c0189e7f95d6ce0643c346
+_md5_=b2d255573e8edc42e3238343c231db88
diff --git a/metadata/md5-cache/sci-libs/clblas-2.10 b/metadata/md5-cache/sci-libs/clblas-2.10
index 18b04705240e..eb7ddae8c0b8 100644
--- a/metadata/md5-cache/sci-libs/clblas-2.10
+++ b/metadata/md5-cache/sci-libs/clblas-2.10
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=virtual/opencl doc? ( dev-libs/mathjax ) performance? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
 REQUIRED_USE=performance? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/clMathLibraries/clBLAS/archive/v2.10.tar.gz -> clblas-2.10.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7cfec4ad1843f2ac35c0ddd4225dfd0
+_md5_=12f91e162b23e86d09d003a33e40b37b
diff --git a/metadata/md5-cache/sci-libs/clblast-0.10.0 b/metadata/md5-cache/sci-libs/clblast-0.10.0
index b23446aa0868..d6d9351fe620 100644
--- a/metadata/md5-cache/sci-libs/clblast-0.10.0
+++ b/metadata/md5-cache/sci-libs/clblast-0.10.0
@@ -7,7 +7,8 @@ IUSE=client doc examples test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=virtual/opencl
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CNugteren/CLBlast/archive/0.10.0.tar.gz -> clblast-0.10.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22cad252ed2da9ccc654e3e6cad23b4d
+_md5_=bb28d0c345439504c3868168f88358a5
diff --git a/metadata/md5-cache/sci-libs/cminpack-1.3.5 b/metadata/md5-cache/sci-libs/cminpack-1.3.5
index 79b274a73c6c..792c5003f342 100644
--- a/metadata/md5-cache/sci-libs/cminpack-1.3.5
+++ b/metadata/md5-cache/sci-libs/cminpack-1.3.5
@@ -6,7 +6,8 @@ HOMEPAGE=http://devernay.free.fr/hacks/cminpack/
 IUSE=doc test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=minpack
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/devernay/cminpack/archive/v1.3.5.tar.gz -> cminpack-1.3.5.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d118aeab5332bd763483768224267a13
+_md5_=00b7c60254f1a1e94c69be9c0a9cd0d9
diff --git a/metadata/md5-cache/sci-libs/coinor-alps-1.4.9 b/metadata/md5-cache/sci-libs/coinor-alps-1.4.9
index 10a720cd7161..0f771eac3440 100644
--- a/metadata/md5-cache/sci-libs/coinor-alps-1.4.9
+++ b/metadata/md5-cache/sci-libs/coinor-alps-1.4.9
@@ -7,7 +7,8 @@ IUSE=doc examples static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CPL-1.0
 RDEPEND=sci-libs/coinor-utils:= sci-libs/coinor-clp:=
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://www.coin-or.org/download/source/Alps/Alps-1.4.9.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=62fd94552ac7febdd32c21eb2bfc8089
+_md5_=170fab690ed8b06e32c65af5ecef35e2
diff --git a/metadata/md5-cache/sci-libs/coinor-alps-1.5.4 b/metadata/md5-cache/sci-libs/coinor-alps-1.5.4
index ceab74edf11e..20da7df25a95 100644
--- a/metadata/md5-cache/sci-libs/coinor-alps-1.5.4
+++ b/metadata/md5-cache/sci-libs/coinor-alps-1.5.4
@@ -7,7 +7,8 @@ IUSE=doc examples static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CPL-1.0
 RDEPEND=sci-libs/coinor-utils:= sci-libs/coinor-clp:=
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://www.coin-or.org/download/source/Alps/Alps-1.5.4.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74d5cd7e27cf8931b18351408d2f2c1d
+_md5_=8df0dbf977673978fc9754a1811d97b2
diff --git a/metadata/md5-cache/sci-libs/coinor-bcp-1.3.8 b/metadata/md5-cache/sci-libs/coinor-bcp-1.3.8
index 3fe292fe219a..6e1be84c9574 100644
--- a/metadata/md5-cache/sci-libs/coinor-bcp-1.3.8
+++ b/metadata/md5-cache/sci-libs/coinor-bcp-1.3.8
@@ -7,7 +7,8 @@ IUSE=doc examples static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CPL-1.0
 RDEPEND=sci-libs/coinor-cgl:= sci-libs/coinor-clp:= sci-libs/coinor-vol:=
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://www.coin-or.org/download/source/Bcp/Bcp-1.3.8.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee1e4d75c83b7e1763f35a247160e8b2
+_md5_=c99d5995bd083df5975d01289d93c677
diff --git a/metadata/md5-cache/sci-libs/coinor-bcps-0.93.10 b/metadata/md5-cache/sci-libs/coinor-bcps-0.93.10
index ef173b355c90..93d4aa118bee 100644
--- a/metadata/md5-cache/sci-libs/coinor-bcps-0.93.10
+++ b/metadata/md5-cache/sci-libs/coinor-bcps-0.93.10
@@ -7,7 +7,8 @@ IUSE=examples static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CPL-1.0
 RDEPEND=sci-libs/coinor-utils:= sci-libs/coinor-clp:= sci-libs/coinor-alps:=
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://www.coin-or.org/download/source/Bcps/Bcps-0.93.10.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=41881968ee21647dca36e5ccbd6b7fae
+_md5_=f5f5dda17e4a1f4a1dda8775d2a533ed
diff --git a/metadata/md5-cache/sci-libs/coinor-blis-0.93.10 b/metadata/md5-cache/sci-libs/coinor-blis-0.93.10
index cc0267542fa7..7ee2216d0ffb 100644
--- a/metadata/md5-cache/sci-libs/coinor-blis-0.93.10
+++ b/metadata/md5-cache/sci-libs/coinor-blis-0.93.10
@@ -7,7 +7,8 @@ IUSE=examples static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CPL-1.0
 RDEPEND=sci-libs/coinor-utils:= sci-libs/coinor-bcps:= sci-libs/coinor-clp:= sci-libs/coinor-alps:=
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://www.coin-or.org/download/source/Blis/Blis-0.93.10.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6c1929d2583ad1d13104d5a2c403f161
+_md5_=b95b0b49bffe00b273c634f5a03f3e21
diff --git a/metadata/md5-cache/sci-libs/coinor-bonmin-1.7.4 b/metadata/md5-cache/sci-libs/coinor-bonmin-1.7.4
index 9442a53719cb..930a9aa921f2 100644
--- a/metadata/md5-cache/sci-libs/coinor-bonmin-1.7.4
+++ b/metadata/md5-cache/sci-libs/coinor-bonmin-1.7.4
@@ -7,7 +7,8 @@ IUSE=doc examples glpk static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CPL-1.0
 RDEPEND=sci-libs/coinor-cbc:= sci-libs/coinor-clp:= sci-libs/ipopt:=
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=http://www.coin-or.org/download/source/Bonmin/Bonmin-1.7.4.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bc27c5eed7ff7209ccb9d25ca87294da
+_md5_=24fe75a5453b427a5724e13f66be6bf8
diff --git a/metadata/md5-cache/sci-libs/coinor-cbc-2.8.9 b/metadata/md5-cache/sci-libs/coinor-cbc-2.8.9
index 0c4d329bf63e..6360f52f5aa1 100644
--- a/metadata/md5-cache/sci-libs/coinor-cbc-2.8.9
+++ b/metadata/md5-cache/sci-libs/coinor-cbc-2.8.9
@@ -7,7 +7,8 @@ IUSE=doc examples static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
 RDEPEND=sci-libs/coinor-clp:= sci-libs/coinor-cgl:= sci-libs/coinor-dylp:= sci-libs/coinor-osi:= sci-libs/coinor-utils:= sci-libs/coinor-vol:=
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://www.coin-or.org/download/source/Cbc/Cbc-2.8.9.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=49443a79de253507cc7c71a007f1a874
+_md5_=dfc1206cf9e65f31cf185d53d6ace603
diff --git a/metadata/md5-cache/sci-libs/coinor-cgl-0.58.6 b/metadata/md5-cache/sci-libs/coinor-cgl-0.58.6
index 8c659b04234e..c457d1f252f1 100644
--- a/metadata/md5-cache/sci-libs/coinor-cgl-0.58.6
+++ b/metadata/md5-cache/sci-libs/coinor-cgl-0.58.6
@@ -7,7 +7,8 @@ IUSE=doc examples static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
 RDEPEND=sci-libs/coinor-clp:= sci-libs/coinor-dylp:= sci-libs/coinor-osi:= sci-libs/coinor-utils:= sci-libs/coinor-vol:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.coin-or.org/download/source/Cgl/Cgl-0.58.6.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f855bacd021e3e14cd97102152a89c8c
+_md5_=3a5659ad1bdadbfd883ddea09dd02b6b
diff --git a/metadata/md5-cache/sci-libs/coinor-clp-1.15.6-r1 b/metadata/md5-cache/sci-libs/coinor-clp-1.15.6-r1
index 91a5856bd7fd..61c3654d4955 100644
--- a/metadata/md5-cache/sci-libs/coinor-clp-1.15.6-r1
+++ b/metadata/md5-cache/sci-libs/coinor-clp-1.15.6-r1
@@ -7,7 +7,8 @@ IUSE=doc examples glpk metis mumps sparse static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
 RDEPEND=sci-libs/coinor-osi:= sci-libs/coinor-utils:= glpk? ( sci-mathematics/glpk:= sci-libs/amd ) metis? ( || ( sci-libs/metis sci-libs/parmetis ) ) mumps? ( sci-libs/mumps ) sparse? ( sci-libs/cholmod )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://www.coin-or.org/download/source/Clp/Clp-1.15.6.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=29cb2280764e7f437d8b8df7b8b1ab9b
+_md5_=cc85cacc1d631640828ad51558048b12
diff --git a/metadata/md5-cache/sci-libs/coinor-couenne-0.4.7 b/metadata/md5-cache/sci-libs/coinor-couenne-0.4.7
index 8c2c32cbe582..0b578b58f436 100644
--- a/metadata/md5-cache/sci-libs/coinor-couenne-0.4.7
+++ b/metadata/md5-cache/sci-libs/coinor-couenne-0.4.7
@@ -7,7 +7,8 @@ IUSE=doc static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
 RDEPEND=sci-libs/coinor-bonmin:=
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://www.coin-or.org/download/source/Couenne/Couenne-0.4.7.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4bba772c408c157a96a52e70cac93596
+_md5_=48ef39e1ab102270a2736cb13f24001e
diff --git a/metadata/md5-cache/sci-libs/coinor-dip-0.9.8 b/metadata/md5-cache/sci-libs/coinor-dip-0.9.8
index cd0f3ae4fca0..59f35dfd0e64 100644
--- a/metadata/md5-cache/sci-libs/coinor-dip-0.9.8
+++ b/metadata/md5-cache/sci-libs/coinor-dip-0.9.8
@@ -7,7 +7,8 @@ IUSE=examples static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
 RDEPEND=sci-libs/coinor-alps:= sci-libs/coinor-cbc:= sci-libs/coinor-cgl:= sci-libs/coinor-clp:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.coin-or.org/download/source/Dip/Dip-0.9.8.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54e56e5c8b80fdcca3ec88211f2f22c3
+_md5_=4c5f093c00bf884275f01cc0865a655a
diff --git a/metadata/md5-cache/sci-libs/coinor-dylp-1.9.4 b/metadata/md5-cache/sci-libs/coinor-dylp-1.9.4
index c5f19971b005..8ff42056c9d2 100644
--- a/metadata/md5-cache/sci-libs/coinor-dylp-1.9.4
+++ b/metadata/md5-cache/sci-libs/coinor-dylp-1.9.4
@@ -7,7 +7,8 @@ IUSE=doc examples static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
 RDEPEND=sci-libs/coinor-osi:=
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://www.coin-or.org/download/source/DyLP/DyLP-1.9.4.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f0ebd59ac024682fa2609c2412b8232
+_md5_=60b14aa0981ace03021a2d960c2df1c9
diff --git a/metadata/md5-cache/sci-libs/coinor-os-2.10.1 b/metadata/md5-cache/sci-libs/coinor-os-2.10.1
index 135c50b19f8c..0ea690128bbf 100644
--- a/metadata/md5-cache/sci-libs/coinor-os-2.10.1
+++ b/metadata/md5-cache/sci-libs/coinor-os-2.10.1
@@ -7,7 +7,8 @@ IUSE=doc examples static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
 RDEPEND=sci-libs/coinor-bcp:= sci-libs/coinor-bonmin:= sci-libs/coinor-couenne:= sci-libs/coinor-clp:= sci-libs/coinor-dylp:= sci-libs/coinor-symphony:= sci-libs/coinor-utils:= sci-libs/coinor-vol:= sci-libs/ipopt:=
+RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=http://www.coin-or.org/download/source/OS/OS-2.10.1.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a92e22ef4fbb902737531fc190f20228
+_md5_=408432213bcc4295fbe15781c5de8ac2
diff --git a/metadata/md5-cache/sci-libs/coinor-osi-0.106.6 b/metadata/md5-cache/sci-libs/coinor-osi-0.106.6
index 71a098b2f8db..5721730a4628 100644
--- a/metadata/md5-cache/sci-libs/coinor-osi-0.106.6
+++ b/metadata/md5-cache/sci-libs/coinor-osi-0.106.6
@@ -7,7 +7,8 @@ IUSE=doc examples glpk static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
 RDEPEND=sci-libs/coinor-utils:= glpk? ( sci-mathematics/glpk:= )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://www.coin-or.org/download/source/Osi/Osi-0.106.6.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fdffecaa8f910458de7131e74d5513e0
+_md5_=0760747ee0e103793c56abec5a89575e
diff --git a/metadata/md5-cache/sci-libs/coinor-smi-0.93.4 b/metadata/md5-cache/sci-libs/coinor-smi-0.93.4
index aa4c656cb422..24b17783ca4e 100644
--- a/metadata/md5-cache/sci-libs/coinor-smi-0.93.4
+++ b/metadata/md5-cache/sci-libs/coinor-smi-0.93.4
@@ -7,7 +7,8 @@ IUSE=doc examples static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CPL-1.0
 RDEPEND=sci-libs/coinor-cbc:= sci-libs/coinor-cgl:= sci-libs/coinor-clp:= sci-libs/coinor-flopcpp:= sci-libs/coinor-osi:= sci-libs/coinor-utils:=
+RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=http://www.coin-or.org/download/source/Smi/Smi-0.93.4.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1be1dd4227cc1c734c13ab12fd1cbbcf
+_md5_=e7d6532c4eaa7ce945c2f15aeb8c14e2
diff --git a/metadata/md5-cache/sci-libs/coinor-symphony-5.5.7 b/metadata/md5-cache/sci-libs/coinor-symphony-5.5.7
index ac65f7282533..711391d355be 100644
--- a/metadata/md5-cache/sci-libs/coinor-symphony-5.5.7
+++ b/metadata/md5-cache/sci-libs/coinor-symphony-5.5.7
@@ -7,7 +7,8 @@ IUSE=doc examples glpk static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
 RDEPEND=sci-libs/coinor-cgl:= sci-libs/coinor-clp:= sci-libs/coinor-dylp:= sci-libs/coinor-osi:= sci-libs/coinor-utils:= sci-libs/coinor-vol:= glpk? ( sci-mathematics/glpk:= )
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://www.coin-or.org/download/source/SYMPHONY/SYMPHONY-5.5.7.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6f513adaeadc97791be868feffedf3ae
+_md5_=fb47b195d04d080a4f3654adc73e6550
diff --git a/metadata/md5-cache/sci-libs/coinor-utils-2.9.11 b/metadata/md5-cache/sci-libs/coinor-utils-2.9.11
index 67502f187366..82367c43e3fc 100644
--- a/metadata/md5-cache/sci-libs/coinor-utils-2.9.11
+++ b/metadata/md5-cache/sci-libs/coinor-utils-2.9.11
@@ -7,7 +7,8 @@ IUSE=bzip2 doc glpk blas lapack static-libs test zlib
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
 RDEPEND=sys-libs/readline:0= bzip2? ( app-arch/bzip2 ) blas? ( virtual/blas ) glpk? ( sci-mathematics/glpk:= ) lapack? ( virtual/lapack ) zlib? ( sys-libs/zlib )
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://www.coin-or.org/download/source/CoinUtils/CoinUtils-2.9.11.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5b73793dd4dd261eee6b98387f7fb995
+_md5_=9f1038f82ea36df4cf7e5d74ae47ee16
diff --git a/metadata/md5-cache/sci-libs/coinor-vol-1.4.4 b/metadata/md5-cache/sci-libs/coinor-vol-1.4.4
index 72719d327653..14703dcd5687 100644
--- a/metadata/md5-cache/sci-libs/coinor-vol-1.4.4
+++ b/metadata/md5-cache/sci-libs/coinor-vol-1.4.4
@@ -7,7 +7,8 @@ IUSE=doc examples static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0
 RDEPEND=sci-libs/coinor-osi:= sci-libs/coinor-utils:=
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://www.coin-or.org/download/source/Vol/Vol-1.4.4.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd606dd78591863c212cca2e2d7058af
+_md5_=68ac0460d39c24f1abdad96fddf00a3f
diff --git a/metadata/md5-cache/sci-libs/dlib-19.16 b/metadata/md5-cache/sci-libs/dlib-19.16
index 5f5cfa92bfb0..f6a14d90870c 100644
--- a/metadata/md5-cache/sci-libs/dlib-19.16
+++ b/metadata/md5-cache/sci-libs/dlib-19.16
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=cblas? ( virtual/cblas:= ) cuda? ( dev-libs/cudnn:= ) gif? ( media-libs/giflib:= ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack:= ) mkl? ( sci-libs/mkl:= ) png? ( media-libs/libpng:0= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) sqlite? ( dev-db/sqlite:3= ) X? ( x11-libs/libX11:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0/19.16
 SRC_URI=https://github.com/davisking/dlib/archive/v19.16.tar.gz -> dlib-19.16.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=806788fe3846cbc0004c7531305cbda5
+_md5_=5d7cf51aef65c317466eee4c83832ece
diff --git a/metadata/md5-cache/sci-libs/dlib-19.7 b/metadata/md5-cache/sci-libs/dlib-19.7
index 7735f69d0c57..982a768e6bff 100644
--- a/metadata/md5-cache/sci-libs/dlib-19.7
+++ b/metadata/md5-cache/sci-libs/dlib-19.7
@@ -7,7 +7,8 @@ IUSE=cblas debug cuda examples gif jpeg lapack mkl png sqlite static-libs test X
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=cblas? ( virtual/cblas:= ) cuda? ( dev-libs/cudnn:= ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack:= ) mkl? ( sci-libs/mkl:= ) png? ( media-libs/libpng:0= ) sqlite? ( dev-db/sqlite:3= ) X? ( x11-libs/libX11:= )
+RESTRICT=!test? ( test )
 SLOT=0/19.7
 SRC_URI=https://github.com/davisking/dlib/archive/v19.7.tar.gz -> dlib-19.7.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a88b3cc763672b2be5a8e448d6508d7
+_md5_=f2b57b8cd9e669b03b405d3dd24bdc51
diff --git a/metadata/md5-cache/sci-libs/dlib-19.9 b/metadata/md5-cache/sci-libs/dlib-19.9
index e04f73a21157..86fb02b299b2 100644
--- a/metadata/md5-cache/sci-libs/dlib-19.9
+++ b/metadata/md5-cache/sci-libs/dlib-19.9
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=cblas? ( virtual/cblas:= ) cuda? ( dev-libs/cudnn:= ) jpeg? ( virtual/jpeg:0= ) lapack? ( virtual/lapack:= ) mkl? ( sci-libs/mkl:= ) png? ( media-libs/libpng:0= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sqlite? ( dev-db/sqlite:3= ) X? ( x11-libs/libX11:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0/19.9
 SRC_URI=https://github.com/davisking/dlib/archive/v19.9.tar.gz -> dlib-19.9.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c1f613c32e5bcc4b8a8167ff1bba105
+_md5_=a05d00efb7006a61e9b3bec05dfdf07e
diff --git a/metadata/md5-cache/sci-libs/dmlc-core-0_p20170719 b/metadata/md5-cache/sci-libs/dmlc-core-0_p20170719
index 202bdc0854d1..874824b90d86 100644
--- a/metadata/md5-cache/sci-libs/dmlc-core-0_p20170719
+++ b/metadata/md5-cache/sci-libs/dmlc-core-0_p20170719
@@ -7,7 +7,8 @@ IUSE=doc openmp s3 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=net-misc/curl[ssl]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dmlc/dmlc-core/archive/54db57d5d1b2a7b93319053011802888b827a539.tar.gz -> dmlc-core-0_p20170719.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28d7b139ac6e414a0a45dd60fa6c7c81
+_md5_=823763b2c9fa4e1189ddbbf261bc4918
diff --git a/metadata/md5-cache/sci-libs/exodusii-6.09 b/metadata/md5-cache/sci-libs/exodusii-6.09
index a181de474b25..55fa88ae1d94 100644
--- a/metadata/md5-cache/sci-libs/exodusii-6.09
+++ b/metadata/md5-cache/sci-libs/exodusii-6.09
@@ -7,7 +7,8 @@ IUSE=static-libs test
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/netcdf[hdf5]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/exodus-6.09.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=220d289adf4bd78c66b8fcc42c1800d2
+_md5_=c6c9c6e517d7b2dc8484baafa9e225b7
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.6_p2 b/metadata/md5-cache/sci-libs/fftw-3.3.6_p2
index dfb253f3b4af..cb37583133cb 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.6_p2
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.6_p2
@@ -7,7 +7,8 @@ IUSE=altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
 SLOT=3.0/3
 SRC_URI=http://www.fftw.org/fftw-3.3.6-pl2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1e44013bd8e686248961dc94a55c01e7
+_md5_=f8d2d0a37acbb2e9799c40429cdba1ce
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.8 b/metadata/md5-cache/sci-libs/fftw-3.3.8
index e9b783ff5587..5ceef73c8e62 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.8
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.8
@@ -7,7 +7,8 @@ IUSE=altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x
 KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
 SLOT=3.0/3
 SRC_URI=http://www.fftw.org/fftw-3.3.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b6b6d8321e050b3877bd48a0c258d17
+_md5_=6f125a2b75fdf13edab22d2be77aa27e
diff --git a/metadata/md5-cache/sci-libs/fftw-9999 b/metadata/md5-cache/sci-libs/fftw-9999
index 35229287fa99..ab8e0e16363e 100644
--- a/metadata/md5-cache/sci-libs/fftw-9999
+++ b/metadata/md5-cache/sci-libs/fftw-9999
@@ -7,6 +7,7 @@ IUSE=altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
 SLOT=3.0/3
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7fc0984d3e06a2dda324f87a78e12b83
+_md5_=8937ae2b03f7120390cccaeba1ae9af4
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2.11 b/metadata/md5-cache/sci-libs/hdf-4.2.11
index 4989705b9e5d..e6f96db7fc81 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.11
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.11
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
 RDEPEND=sys-libs/zlib virtual/jpeg:0 szip? ( virtual/szip ) fortran? ( virtual/fortran )
 REQUIRED_USE=test? ( szip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.11.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=541d763e9d2e62eb32f0b77366294a8c
+_md5_=008f684ee9c81c4ebc9de568be1bcd8a
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2.13 b/metadata/md5-cache/sci-libs/hdf-4.2.13
index 3f101deb8c47..2de1a2676403 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.13
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.13
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
 RDEPEND=sys-libs/zlib virtual/jpeg:0 szip? ( virtual/szip ) fortran? ( virtual/fortran )
 REQUIRED_USE=test? ( szip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.13.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ca5b803ffaafdf6e627c16c75c068006
+_md5_=cfdfc02db72e2a1923d5a799cc10af3a
diff --git a/metadata/md5-cache/sci-libs/hdf-4.2.13-r1 b/metadata/md5-cache/sci-libs/hdf-4.2.13-r1
index 4e8713619248..8f276a399d6c 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.13-r1
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.13-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ia64 ppc -sparc x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
 RDEPEND=net-libs/libtirpc sys-libs/zlib virtual/jpeg:0 szip? ( virtual/szip ) fortran? ( virtual/fortran )
 REQUIRED_USE=test? ( szip )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.13.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13a9b2fd504fc0199a986be150a6149e
+_md5_=48959737199fd733d0cd289f2d4a011a
diff --git a/metadata/md5-cache/sci-libs/indilib-1.7.5 b/metadata/md5-cache/sci-libs/indilib-1.7.5
index d84e18f77e3d..92134fe20087 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.7.5
+++ b/metadata/md5-cache/sci-libs/indilib-1.7.5
@@ -8,7 +8,8 @@ IUSE=ogg test
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=BSD GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/gsl:= sci-libs/libnova sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/indilib-1.7.5.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b099e185a344d408e7b1cf4fabceee6
+_md5_=00050d3dd74bd96458a62b59295c67e1
diff --git a/metadata/md5-cache/sci-libs/ipopt-3.11.7 b/metadata/md5-cache/sci-libs/ipopt-3.11.7
index 6f67ea1b41f0..3373e1d9b562 100644
--- a/metadata/md5-cache/sci-libs/ipopt-3.11.7
+++ b/metadata/md5-cache/sci-libs/ipopt-3.11.7
@@ -7,7 +7,8 @@ IUSE=doc examples hsl lapack mpi mumps static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0 hsl? ( HSL )
 RDEPEND=virtual/blas hsl? ( sci-libs/coinhsl ) lapack? ( virtual/lapack ) mumps? ( sci-libs/mumps[mpi=] ) mumps? ( virtual/fortran )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://www.coin-or.org/download/source/Ipopt/Ipopt-3.11.7.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6635f3951c61f849d0af72390a65b4b
+_md5_=97d3d541693435e11aad5069166228ea
diff --git a/metadata/md5-cache/sci-libs/ipopt-3.11.8 b/metadata/md5-cache/sci-libs/ipopt-3.11.8
index 5e721262c507..3fe072fc6ac6 100644
--- a/metadata/md5-cache/sci-libs/ipopt-3.11.8
+++ b/metadata/md5-cache/sci-libs/ipopt-3.11.8
@@ -7,7 +7,8 @@ IUSE=doc examples hsl lapack mpi mumps static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=EPL-1.0 hsl? ( HSL )
 RDEPEND=virtual/blas hsl? ( sci-libs/coinhsl:0= ) lapack? ( virtual/lapack ) mumps? ( sci-libs/mumps:0=[mpi=] ) mumps? ( virtual/fortran )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://www.coin-or.org/download/source/Ipopt/Ipopt-3.11.8.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9c626b704480c4287569d40cb0b5e101
+_md5_=69c8fdc09f889768585919e05e8c191b
diff --git a/metadata/md5-cache/sci-libs/lemon-1.3.1 b/metadata/md5-cache/sci-libs/lemon-1.3.1
index 52552cc25144..cbec1cdeb013 100644
--- a/metadata/md5-cache/sci-libs/lemon-1.3.1
+++ b/metadata/md5-cache/sci-libs/lemon-1.3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=coin? ( sci-libs/coinor-cbc:= sci-libs/coinor-clp:= ) glpk? ( sci-mathematics/glpk:= )
 REQUIRED_USE=|| ( coin glpk )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://lemon.cs.elte.hu/pub/sources/lemon-1.3.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7447b16c338ff0283efa33005f253b0
+_md5_=e1479d47084e9027083fb2b734077127
diff --git a/metadata/md5-cache/sci-libs/levmar-2.6 b/metadata/md5-cache/sci-libs/levmar-2.6
index af9a30319e69..605e1f3f4135 100644
--- a/metadata/md5-cache/sci-libs/levmar-2.6
+++ b/metadata/md5-cache/sci-libs/levmar-2.6
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/lapack
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.ics.forth.gr/~lourakis/levmar//levmar-2.6.tgz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca1fe4c2b38dc3033487dc8c32f45e99
+_md5_=4b4714231427373bfabdac98d5226cd5
diff --git a/metadata/md5-cache/sci-libs/libcerf-1.5 b/metadata/md5-cache/sci-libs/libcerf-1.5
index dee0eabb02b4..079395dfdbf0 100644
--- a/metadata/md5-cache/sci-libs/libcerf-1.5
+++ b/metadata/md5-cache/sci-libs/libcerf-1.5
@@ -5,6 +5,7 @@ HOMEPAGE=http://apps.jcns.fz-juelich.de/doku/sc/libcerf
 IUSE=doc static-libs test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.5.tgz
-_md5_=951066ae9bb83439dcd3b0755ed9c9ac
+_md5_=441bd62ff89a16edadf702ae7a0ae679
diff --git a/metadata/md5-cache/sci-libs/libdap-3.18.1 b/metadata/md5-cache/sci-libs/libdap-3.18.1
index 975c80af011b..fc7e09f89f59 100644
--- a/metadata/md5-cache/sci-libs/libdap-3.18.1
+++ b/metadata/md5-cache/sci-libs/libdap-3.18.1
@@ -7,7 +7,8 @@ IUSE=static-libs test
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-2.1 URI )
 RDEPEND=dev-libs/libxml2:2 net-misc/curl sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.opendap.org/pub/source/libdap-3.18.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0b899c3b389c5f417afd7031b5a40ba0
+_md5_=6202ca3a9df310516a253679925b75fb
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.3.0 b/metadata/md5-cache/sci-libs/libsigrok-0.3.0
index 8dcce5e0f144..66eef842b6b1 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.3.0
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.3.0
@@ -7,7 +7,8 @@ IUSE=ftdi serial static-libs test usb
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= ftdi? ( >=dev-embedded/libftdi-0.16:= ) serial? ( >=dev-libs/libserialport-0.1.0 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) serial? ( >=dev-libs/libserialport-0.1.0[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) )
+RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.3.0.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_=4d26fbd7ad157e9b221d9febb90a49c1
+_md5_=e3937fdcc34977a3fe4bc4fc416f4135
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.4.0 b/metadata/md5-cache/sci-libs/libsigrok-0.4.0
index f36c6749dd23..6e6e912668f7 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.4.0
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/pygobject-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/pygobject-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=java? ( cxx ) python? ( cxx ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ce263aec290b6ab4c8bc04556e92c4ca
+_md5_=29097b44fdee7a8de3a26ed8a1a51511
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.1 b/metadata/md5-cache/sci-libs/libsigrok-0.5.1
index c1c82a748827..c586c4acd706 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.1
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.5.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-python/pygobject-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-python/pygobject-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=java? ( cxx ) python? ( cxx ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b194e27a357290de9dc1cbbc01076a6a
+_md5_=acfc1371191b0b04b09603826b624ce6
diff --git a/metadata/md5-cache/sci-libs/libsigrok-9999 b/metadata/md5-cache/sci-libs/libsigrok-9999
index b9a4f38c36b5..c6f9e8044a93 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-9999
+++ b/metadata/md5-cache/sci-libs/libsigrok-9999
@@ -8,6 +8,7 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) ruby? ( cxx || ( ruby_targets_ruby26 ruby_targets_ruby25 ruby_targets_ruby24 ) )
+RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	ruby-ng	5ad91e467b477000267afdeea4a7093e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=604d2aadc1b2792a90e3c1a497101cb6
+_md5_=2601cb2b2a46d1dc6bdf83afca0a24d6
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.3.2-r1 b/metadata/md5-cache/sci-libs/netcdf-4.3.2-r1
index cc513d44b36d..f1f2f3bb00c1 100644
--- a/metadata/md5-cache/sci-libs/netcdf-4.3.2-r1
+++ b/metadata/md5-cache/sci-libs/netcdf-4.3.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
 RDEPEND=dap? ( net-misc/curl:0= ) hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= ) hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )
 REQUIRED_USE=test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )
+RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.3.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=43fb8fdba0629ed1352770988872c37a
+_md5_=9c3aec11d624a82ae1586a6486739877
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.6.1 b/metadata/md5-cache/sci-libs/netcdf-4.6.1
index 66f5afeefd26..71931b49fca1 100644
--- a/metadata/md5-cache/sci-libs/netcdf-4.6.1
+++ b/metadata/md5-cache/sci-libs/netcdf-4.6.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
 RDEPEND=dap? ( net-misc/curl:0= ) hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= ) hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )
 REQUIRED_USE=test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )
+RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://github.com/Unidata/netcdf-c/archive/v4.6.1.tar.gz -> netcdf-4.6.1.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_=005ff09a217a4f8a04ffee724545be81
+_md5_=a08fdfcba53fda51743c268093e1a1d2
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.6.1-r1 b/metadata/md5-cache/sci-libs/netcdf-4.6.1-r1
index caace20a746f..3a0a13ecba40 100644
--- a/metadata/md5-cache/sci-libs/netcdf-4.6.1-r1
+++ b/metadata/md5-cache/sci-libs/netcdf-4.6.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
 RDEPEND=dap? ( net-misc/curl:0= ) hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= ) hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )
 REQUIRED_USE=test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )
+RESTRICT=!test? ( test )
 SLOT=0/13
 SRC_URI=https://github.com/Unidata/netcdf-c/archive/v4.6.1.tar.gz -> netcdf-4.6.1.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_=bba7100c04f583ec140d32640831c529
+_md5_=8a2ba1206b5873f5860a43a223a9c996
diff --git a/metadata/md5-cache/sci-libs/orocos-bfl-0.8.0 b/metadata/md5-cache/sci-libs/orocos-bfl-0.8.0
index 8fbdcb638a8d..d044aabc2189 100644
--- a/metadata/md5-cache/sci-libs/orocos-bfl-0.8.0
+++ b/metadata/md5-cache/sci-libs/orocos-bfl-0.8.0
@@ -7,7 +7,8 @@ IUSE=doc examples static-libs test
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://people.mech.kuleuven.be/~tdelaet/bfl_tar/orocos-bfl-0.8.0-src.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3140f075fa74dac5d581f31cf40a5de9
+_md5_=38344d62a503de12ae727d0197da7ce1
diff --git a/metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1 b/metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1
index 13debc386c3b..68567eea90b3 100644
--- a/metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1
+++ b/metadata/md5-cache/sci-libs/orocos_kdl-1.3.1-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-cpp/eigen:3
 REQUIRED_USE=examples? ( models )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.3.1.tar.gz -> orocos_kinematics_dynamics-1.3.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50510226efb306edacd211dd5aa8fdb6
+_md5_=57068c262363c651882ae97ac279d7c0
diff --git a/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0 b/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0
index ab8735992a87..e69818ce954f 100644
--- a/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0
+++ b/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-cpp/eigen:3
 REQUIRED_USE=examples? ( models )
+RESTRICT=!test? ( test )
 SLOT=0/14
 SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.4.0.tar.gz -> orocos_kinematics_dynamics-1.4.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d8a61ce35b24c50f2ca2ad89345a2eb
+_md5_=78858cac7af03a2787f741ce33a2d5cd
diff --git a/metadata/md5-cache/sci-libs/orocos_kdl-9999 b/metadata/md5-cache/sci-libs/orocos_kdl-9999
index d3efdc299b95..ba01199de462 100644
--- a/metadata/md5-cache/sci-libs/orocos_kdl-9999
+++ b/metadata/md5-cache/sci-libs/orocos_kdl-9999
@@ -8,6 +8,7 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-cpp/eigen:3
 REQUIRED_USE=examples? ( models )
+RESTRICT=!test? ( test )
 SLOT=0/14
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d8a61ce35b24c50f2ca2ad89345a2eb
+_md5_=78858cac7af03a2787f741ce33a2d5cd
diff --git a/metadata/md5-cache/sci-libs/pcl-1.9.1 b/metadata/md5-cache/sci-libs/pcl-1.9.1
index 20cceea720fd..e0f0bae4c274 100644
--- a/metadata/md5-cache/sci-libs/pcl-1.9.1
+++ b/metadata/md5-cache/sci-libs/pcl-1.9.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
 REQUIRED_USE=openni? ( usb ) openni2? ( usb ) tutorials? ( doc )
+RESTRICT=!test? ( test )
 SLOT=0/1.9
 SRC_URI=https://github.com/PointCloudLibrary/pcl/archive/pcl-1.9.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7adce124504a5b91487647fc15380b96
+_md5_=be08fc16cf6ede4e11a5f28919e50f47
diff --git a/metadata/md5-cache/sci-libs/pcl-9999 b/metadata/md5-cache/sci-libs/pcl-9999
index 5d836a8f4e47..30b439afa681 100644
--- a/metadata/md5-cache/sci-libs/pcl-9999
+++ b/metadata/md5-cache/sci-libs/pcl-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
 REQUIRED_USE=openni? ( usb ) openni2? ( usb ) tutorials? ( doc )
+RESTRICT=!test? ( test )
 SLOT=0/1.9
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7adce124504a5b91487647fc15380b96
+_md5_=be08fc16cf6ede4e11a5f28919e50f47
diff --git a/metadata/md5-cache/sci-libs/proj-6.2.0 b/metadata/md5-cache/sci-libs/proj-6.2.0
index 332dc30b3316..1ca981f430b4 100644
--- a/metadata/md5-cache/sci-libs/proj-6.2.0
+++ b/metadata/md5-cache/sci-libs/proj-6.2.0
@@ -8,6 +8,7 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x8
 LICENSE=MIT
 RDEPEND=dev-db/sqlite:3
 REQUIRED_USE=test? ( !europe )
+RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=https://download.osgeo.org/proj/proj-6.2.0.tar.gz https://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz europe? ( https://download.osgeo.org/proj/proj-datumgrid-europe-1.4.tar.gz )
-_md5_=f438115e8dbd1c37191823e9ba5b86a9
+_md5_=a8a675430b38d0c74f1e4e4cada1a315
diff --git a/metadata/md5-cache/sci-libs/scalapack-2.0.2-r1 b/metadata/md5-cache/sci-libs/scalapack-2.0.2-r1
index bf633db0edb9..ca57246ae177 100644
--- a/metadata/md5-cache/sci-libs/scalapack-2.0.2-r1
+++ b/metadata/md5-cache/sci-libs/scalapack-2.0.2-r1
@@ -7,7 +7,8 @@ IUSE=static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/lapack virtual/mpi virtual/fortran
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.netlib.org/scalapack//scalapack-2.0.2.tgz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88be3517c2b630b5e460d2a6e6745609
+_md5_=e6c14d47813d6186ce5e15ec7765199c
diff --git a/metadata/md5-cache/sci-libs/scikits_image-0.13.0 b/metadata/md5-cache/sci-libs/scikits_image-0.13.0
index cb74755b62d8..b389b0273345 100644
--- a/metadata/md5-cache/sci-libs/scikits_image-0.13.0
+++ b/metadata/md5-cache/sci-libs/scikits_image-0.13.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pywavelets[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[sparse,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] freeimage? ( media-libs/freeimage ) pyamg? ( dev-python/pyamg[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.13.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=399d8993a3ddaef6a76a76cdf9ddb980
+_md5_=a88f43ea2c871bc9128246f0d0e5395c
diff --git a/metadata/md5-cache/sci-libs/scikits_image-0.13.0-r1 b/metadata/md5-cache/sci-libs/scikits_image-0.13.0-r1
index 934335ef98b6..a7ad84d30f21 100644
--- a/metadata/md5-cache/sci-libs/scikits_image-0.13.0-r1
+++ b/metadata/md5-cache/sci-libs/scikits_image-0.13.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pywavelets[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[sparse,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] freeimage? ( media-libs/freeimage ) pyamg? ( dev-python/pyamg[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.13.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=dcc33f94813a2db8ca2673e9a8ce43e7
+_md5_=c9b4b3c90fd6e0a07f771869c6e72e28
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.17 b/metadata/md5-cache/sci-libs/scikits_learn-0.17
index 5058204197f6..89e061f6ca0b 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.17
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.17
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/joblib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.6.1[lapack,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-libs/scipy-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/blas virtual/cblas virtual/python-funcsigs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=696f3e8912bde6095ae4a71b6db36e4f
+_md5_=a2d94fff1e2a47f654524acbe2632004
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.17.1 b/metadata/md5-cache/sci-libs/scikits_learn-0.17.1
index d8ddbf8e617e..5fe2d28c6fd6 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.17.1
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.17.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/joblib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6.1[lapack,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scikits[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=sci-libs/scipy-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] virtual/blas virtual/cblas virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.17.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a12943e4955d4c37677f39338ea6a6d
+_md5_=91776b0d7be7b8675e481a20a1f92416
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.18.1 b/metadata/md5-cache/sci-libs/scikits_learn-0.18.1
index d6487f9c2066..c6a7d5190eba 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.18.1
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.18.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/joblib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6.1[lapack,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] sci-libs/scikits[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=sci-libs/scipy-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] virtual/blas virtual/cblas virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.18.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f0b75c4b3962302f58f0bd96f49d12fa
+_md5_=d5849f2745be98e9a4cfae4da8f91b13
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.18.2 b/metadata/md5-cache/sci-libs/scikits_learn-0.18.2
index ba141c88ea45..79c60b712e6b 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.18.2
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.18.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/joblib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.6.1[lapack,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/blas virtual/cblas virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.18.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=274388bb148ea8af646e17882a9a94ef
+_md5_=bdc7a33cb8d218aaf5f99f82f8ebe892
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.18.2-r1 b/metadata/md5-cache/sci-libs/scikits_learn-0.18.2-r1
index e5bcbc73f658..75f95acf7454 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.18.2-r1
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.18.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[lapack,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/blas:= virtual/cblas:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.18.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e632368206a6337a52caa56e4906d6ba
+_md5_=fcdc512047d9670d2732de2b59e74ab5
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.19.0 b/metadata/md5-cache/sci-libs/scikits_learn-0.19.0
index 07ac2dbfcd04..aa20d4484a8f 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.19.0
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.19.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[lapack,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/blas:= virtual/cblas:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.19.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff440172965a38d0433e2e243e288b56
+_md5_=8a455f03defd59a2887691282bfb06a6
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.19.0-r1 b/metadata/md5-cache/sci-libs/scikits_learn-0.19.0-r1
index 4dcaf0aee25f..380d47bd238b 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.19.0-r1
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.19.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[lapack,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scikits[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/blas:= virtual/cblas:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.19.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=23dbf3da101203985569faaeea3b82f9
+_md5_=db76dc8ccb5b067fd531794d602413f3
diff --git a/metadata/md5-cache/sci-libs/scipy-0.16.1 b/metadata/md5-cache/sci-libs/scipy-0.16.1
index cba157f92729..fe96a9fc189c 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.16.1
+++ b/metadata/md5-cache/sci-libs/scipy-0.16.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.6.2[lapack,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-0.16.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-0.16.1/scipy-html-0.16.1.zip -> scipy-0.16.1-html.zip https://docs.scipy.org/doc/scipy-0.16.1/scipy-ref-0.16.1.pdf -> scipy-0.16.1-ref.pdf )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c891f71f9b36ae3c27f1963fbb8a2c85
+_md5_=8095b98d03101f65030727286f8a3389
diff --git a/metadata/md5-cache/sci-libs/scipy-0.18.1 b/metadata/md5-cache/sci-libs/scipy-0.18.1
index ad3e377f7f0e..deb2af85349f 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.18.1
+++ b/metadata/md5-cache/sci-libs/scipy-0.18.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-ma
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-0.18.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-0.18.1/scipy-html-0.18.1.zip -> scipy-0.18.1-html.zip https://docs.scipy.org/doc/scipy-0.18.1/scipy-ref-0.18.1.pdf -> scipy-0.18.1-ref.pdf )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5679a1eab289c9344a291b6cecc2635d
+_md5_=0131155455a91918acc3ac54704c918b
diff --git a/metadata/md5-cache/sci-libs/scipy-0.19.1 b/metadata/md5-cache/sci-libs/scipy-0.19.1
index 91b8cdbf1f5a..4d97acac301a 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.19.1
+++ b/metadata/md5-cache/sci-libs/scipy-0.19.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-0.19.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-0.19.1/scipy-html-0.19.1.zip -> scipy-0.19.1-html.zip https://docs.scipy.org/doc/scipy-0.19.1/scipy-ref-0.19.1.pdf -> scipy-0.19.1-ref.pdf )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15ab4976165064ddd13c7e623725d4df
+_md5_=2d73e81adbb3031a29dc8578ebf60efc
diff --git a/metadata/md5-cache/sci-libs/scipy-1.0.0 b/metadata/md5-cache/sci-libs/scipy-1.0.0
index 19b2ede2f32b..4b138a1a7aeb 100644
--- a/metadata/md5-cache/sci-libs/scipy-1.0.0
+++ b/metadata/md5-cache/sci-libs/scipy-1.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-ma
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.0.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.0.0/scipy-html-1.0.0.zip -> scipy-1.0.0-html.zip https://docs.scipy.org/doc/scipy-1.0.0/scipy-ref-1.0.0.pdf -> scipy-1.0.0-ref.pdf )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f0473159e1ec011e1c8b70df7327799
+_md5_=b8b966488c209277938c5bf5bb98632d
diff --git a/metadata/md5-cache/sci-libs/scipy-1.1.0 b/metadata/md5-cache/sci-libs/scipy-1.1.0
index e27c07973889..ad70d044eb26 100644
--- a/metadata/md5-cache/sci-libs/scipy-1.1.0
+++ b/metadata/md5-cache/sci-libs/scipy-1.1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.1.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.1.0/scipy-html-1.1.0.zip -> scipy-1.1.0-html.zip https://docs.scipy.org/doc/scipy-1.1.0/scipy-ref-1.1.0.pdf -> scipy-1.1.0-ref.pdf )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1e6faf236fd2904ef62729957061c3a
+_md5_=c6878160dfdeddf20cefd316d1fd7aab
diff --git a/metadata/md5-cache/sci-libs/scipy-9999 b/metadata/md5-cache/sci-libs/scipy-9999
index 5371abf9aa14..f722ea02bd4b 100644
--- a/metadata/md5-cache/sci-libs/scipy-9999
+++ b/metadata/md5-cache/sci-libs/scipy-9999
@@ -8,6 +8,7 @@ LICENSE=BSD LGPL-2
 PROPERTIES=live
 RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c9c8ce054d2fd1339fc9a223a782361
+_md5_=221ca4279bad2c2b3645ca833a49c2e2
diff --git a/metadata/md5-cache/sci-libs/shogun-5.0.0 b/metadata/md5-cache/sci-libs/shogun-5.0.0
index 9ae59cfb1099..3ee739b160a8 100644
--- a/metadata/md5-cache/sci-libs/shogun-5.0.0
+++ b/metadata/md5-cache/sci-libs/shogun-5.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3 free-noncomm
 RDEPEND=app-arch/bzip2 app-arch/gzip app-arch/lzma app-arch/snappy dev-libs/lzo dev-cpp/eigen:3 dev-libs/json-c:= dev-libs/libxml2 dev-libs/protobuf:= net-misc/curl sci-libs/arpack sci-libs/arprec sci-libs/colpack sci-libs/hdf5:= sci-libs/nlopt sci-mathematics/glpk:= sci-mathematics/lpsolve:= sys-libs/readline:0= sys-libs/zlib virtual/blas virtual/cblas virtual/lapack lua? ( dev-lang/lua:0 ) octave? ( >=sci-mathematics/octave-4.2.0:=[hdf5] ) opencl? ( virtual/opencl ) python? ( 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) R? ( dev-lang/R ) ruby? ( dev-ruby/narray )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) test? ( python )
+RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=ftp://shogun-toolbox.org/shogun/releases/5.0/sources/shogun-5.0.0.tar.bz2 test? ( ftp://shogun-toolbox.org/shogun/data/shogun-data-0.9.tar.bz2 ) examples? ( ftp://shogun-toolbox.org/shogun/data/shogun-data-0.9.tar.bz2 )
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=558d5bb52bbe82e9005255ede934e49c
+_md5_=6ec4214f47006c3bb8e4ac52e0530882
diff --git a/metadata/md5-cache/sci-libs/silo-4.10.2-r1 b/metadata/md5-cache/sci-libs/silo-4.10.2-r1
index d5500fc875f3..30ec1b9574fc 100644
--- a/metadata/md5-cache/sci-libs/silo-4.10.2-r1
+++ b/metadata/md5-cache/sci-libs/silo-4.10.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=hdf5? ( sci-libs/hdf5 ) qt5? ( dev-qt/qtgui:5 ) virtual/fortran
 REQUIRED_USE=silex? ( qt5 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-4.10.2/silo-4.10.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2189dd8dc9ad6aa807d02f3b2e44a8b
+_md5_=49ee2ae9475b196bc2231906704f5cc6
diff --git a/metadata/md5-cache/sci-libs/superlu-4.3-r1 b/metadata/md5-cache/sci-libs/superlu-4.3-r1
index 8c34ee5460ab..166ec646b84e 100644
--- a/metadata/md5-cache/sci-libs/superlu-4.3-r1
+++ b/metadata/md5-cache/sci-libs/superlu-4.3-r1
@@ -7,7 +7,8 @@ IUSE=doc examples static-libs test
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/blas virtual/fortran
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://crd-legacy.lbl.gov/~xiaoye/SuperLU//superlu_4.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e400a033c6475502d84c20a95633b4b
+_md5_=b6af912ad4fb3179f7b9d974998b6b44
diff --git a/metadata/md5-cache/sci-libs/superlu-5.2.1-r1 b/metadata/md5-cache/sci-libs/superlu-5.2.1-r1
index 7c9dfba4b2ad..b637464c44df 100644
--- a/metadata/md5-cache/sci-libs/superlu-5.2.1-r1
+++ b/metadata/md5-cache/sci-libs/superlu-5.2.1-r1
@@ -7,7 +7,8 @@ IUSE=doc examples test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/blas virtual/fortran
+RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://crd-legacy.lbl.gov/~xiaoye/SuperLU//superlu_5.2.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0457f4256373cf8c6fbc124484f45130
+_md5_=c1745009b79e156d40c2a4935c20438d
diff --git a/metadata/md5-cache/sci-libs/superlu_mt-3.1 b/metadata/md5-cache/sci-libs/superlu_mt-3.1
index 1191c7ce0f14..b1b43bb1fabe 100644
--- a/metadata/md5-cache/sci-libs/superlu_mt-3.1
+++ b/metadata/md5-cache/sci-libs/superlu_mt-3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/blas
 REQUIRED_USE=|| ( openmp threads )
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://crd.lbl.gov/~xiaoye/SuperLU//superlu_mt_3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1d5dfc446e9f72280faf07c1243da169
+_md5_=b28bac166b88fcc6a1504471b55b16d4
diff --git a/metadata/md5-cache/sci-libs/symengine-0.3.0-r1 b/metadata/md5-cache/sci-libs/symengine-0.3.0-r1
index f963dedda8f9..9ae03e7f1d5c 100644
--- a/metadata/md5-cache/sci-libs/symengine-0.3.0-r1
+++ b/metadata/md5-cache/sci-libs/symengine-0.3.0-r1
@@ -7,7 +7,8 @@ IUSE=arb benchmarks boost debug doc flint llvm mpc mpfr openmp test tcmalloc thr
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) mpc? ( dev-libs/mpc:= ) tcmalloc? ( dev-util/google-perftools )
+RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://github.com/sympy/symengine/archive/v0.3.0.tar.gz -> symengine-0.3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a946a796f2963a036408f23a277f2f29
+_md5_=61de6f40b0e9a9edd13e66038d03ec40
diff --git a/metadata/md5-cache/sci-libs/symengine-0.4.0 b/metadata/md5-cache/sci-libs/symengine-0.4.0
index 030be0e2afdd..9f0446e81ac1 100644
--- a/metadata/md5-cache/sci-libs/symengine-0.4.0
+++ b/metadata/md5-cache/sci-libs/symengine-0.4.0
@@ -8,7 +8,8 @@ IUSE=arb benchmarks boost debug doc flint llvm mpc mpfr openmp test tcmalloc thr
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) mpc? ( dev-libs/mpc:= ) tcmalloc? ( dev-util/google-perftools )
+RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://github.com/sympy/symengine/archive/v0.4.0.tar.gz -> symengine-0.4.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c7900ec67aa24578224374324f4bab0
+_md5_=8d2fa75d90620b3eddbb829c799e7f13
diff --git a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r3 b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r3
index 00c1f544805e..9d1797a4b369 100644
--- a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r3
+++ b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r3
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=VTK
 RDEPEND=dev-libs/boost:= sci-libs/hdf5:= dev-libs/libxml2:2 python? ( 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? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/xdmf2-1.0_p141226.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fdeab0d5b31dd4fa70b0373133af1b2c
+_md5_=7028816224abc472754fc04c8f71ef52
diff --git a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1 b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1
index c59589b8ce5f..c28555ba769c 100644
--- a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1
+++ b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=dev-python/cvxopt[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dunshire/dunshire-0.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0bb28fb1eefb691104e07adaad1e8fe2
+_md5_=fb2d0a2396f35e0a319d572fb6037ed9
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.4-r1 b/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.4-r1
index b80790a8efe4..9a5589ededa5 100644
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.4-r1
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.4-r1
@@ -7,7 +7,8 @@ IUSE=+blas +custom-tune -openmp static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/gmp:0= blas? ( sci-libs/gsl ) openmp? ( sys-devel/gcc:*[openmp] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/32159/gmp-ecm-6.4.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b96933eb087931da43f09570f9e7fc00
+_md5_=1aa321b045a62a9f69ccc1455871b582
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r1 b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r1
index 31f3f3d0f38c..482c3c402352 100644
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r1
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r1
@@ -7,7 +7,8 @@ IUSE=+blas +custom-tune -openmp static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/gmp:0= blas? ( sci-libs/gsl ) openmp? ( sys-devel/gcc:*[openmp] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/36224/gmp-ecm-7.0.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e6826662236b7c9d3f9486fdffd1922
+_md5_=2e8bdc3bb19cece94e6cbb50db481d83
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-9999 b/metadata/md5-cache/sci-mathematics/gmp-ecm-9999
index abc18872bef1..4519069a4cfa 100644
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-9999
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-9999
@@ -7,6 +7,7 @@ IUSE=blas -openmp test
 LICENSE=GPL-3 LGPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/gmp:0= blas? ( sci-libs/gsl ) openmp? ( sys-devel/gcc:*[openmp] )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	76e4ab6ae9cda8407c34d0b9a086f81c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d0c34b23afa54cff40c3530c40f8c88
+_md5_=4729644098f9b3c13eb98c48735360b4
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.43.0 b/metadata/md5-cache/sci-mathematics/maxima-5.43.0
index b11e356c8557..b203b85385fd 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.43.0
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.43.0
@@ -7,7 +7,8 @@ IUSE=emacs tk nls unicode X test sbcl cmucl gcl ecls clozurecl clisp l10n_de l10
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2 GPL-2+
 RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.43.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=45427fafe9fd1d606cd117c3e72b2b73
+_md5_=6e5fb5978099617b88ad634319c6c12c
diff --git a/metadata/md5-cache/sci-mathematics/nauty-2.6.7 b/metadata/md5-cache/sci-mathematics/nauty-2.6.7
index 9017188942e8..fa45e29e1312 100644
--- a/metadata/md5-cache/sci-mathematics/nauty-2.6.7
+++ b/metadata/md5-cache/sci-mathematics/nauty-2.6.7
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:0 sys-libs/zlib
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://cs.anu.edu.au/~bdm/nauty/nauty26r7.tar.gz mirror://debian/pool/main/n/nauty/nauty_2.6r7+ds-1.debian.tar.xz http://pkgs.fedoraproject.org/cgit/rpms/nauty.git/plain/nauty-popcnt.patch
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=157162b591bd1804ba8a2634fc703260
+_md5_=ade58178cad4ecf5d4e91f292ef40f4c
diff --git a/metadata/md5-cache/sci-mathematics/pymc3-3.1 b/metadata/md5-cache/sci-mathematics/pymc3-3.1
index 5f2a5178b40e..71d18a87c800 100644
--- a/metadata/md5-cache/sci-mathematics/pymc3-3.1
+++ b/metadata/md5-cache/sci-mathematics/pymc3-3.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=AFL-3.0
 RDEPEND=<=dev-python/commonmark-0.5.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/joblib-0.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.11[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),lapack] >=dev-python/matplotlib-1.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpydoc[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.18[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/patsy-0.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/recommonmark-0.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/theano-0.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tqdm-4.8.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymc3/pymc3-3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d06f7d8e7b42be19f97b09ed1a3d8f36
+_md5_=ce7f544c40ba91bfd46c443d8f24b909
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1 b/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
index e33299195a1f..f3ff140705d2 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
@@ -8,7 +8,8 @@ IUSE=gui +jupyter static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 gui? ( MIT Apache-2.0 OFL-1.1 )
 RDEPEND=gui? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 ) jupyter? ( dev-libs/boost:= dev-libs/jsoncpp:= dev-libs/openssl:0= dev-python/jupyter net-libs/zeromq >=net-libs/zmqpp-4.1.2 )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://codeload.github.com/grzegorzmazur/yacas/tar.gz/v1.7.0 -> yacas-1.7.0.tar.gz gui? ( https://dev.gentoo.org/~asturm/distfiles/yacas-bundled-1.7.0.tar.xz )
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a78c4aa470965e82011bf3662857075
+_md5_=55ceae5aac4ccffcc5bcc4d9fb4ed4bf
diff --git a/metadata/md5-cache/sci-misc/nco-4.5.1-r2 b/metadata/md5-cache/sci-misc/nco-4.5.1-r2
index b94e775da9da..6d57ee376d53 100644
--- a/metadata/md5-cache/sci-misc/nco-4.5.1-r2
+++ b/metadata/md5-cache/sci-misc/nco-4.5.1-r2
@@ -7,7 +7,8 @@ IUSE=dap gsl hdf5 ncap2 openmp static-libs test udunits
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=sci-libs/netcdf-4:=[dap=,hdf5?,tools] gsl? ( sci-libs/gsl:= ) ncap2? ( dev-cpp/antlr-cpp:2= ) udunits? ( >=sci-libs/udunits-2 )
+RESTRICT=!test? ( test )
 SLOT=0/4.5.1
 SRC_URI=http://nco.sf.net/src/nco-4.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=77d4d7066b37b66edab1b195c05f8950
+_md5_=d08f6e1cb7c256e5653dd01e1ee21b4b
diff --git a/metadata/md5-cache/sci-physics/clhep-2.2.0.5 b/metadata/md5-cache/sci-physics/clhep-2.2.0.5
index 7e388f3d81ae..63dac4ca10ad 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.2.0.5
+++ b/metadata/md5-cache/sci-physics/clhep-2.2.0.5
@@ -6,7 +6,8 @@ HOMEPAGE=http://proj-clhep.web.cern.ch/proj-clhep/
 IUSE=doc static-libs test
 KEYWORDS=amd64 hppa ppc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
+RESTRICT=!test? ( test )
 SLOT=2/2.2.0.5
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.2.0.5.tgz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60b334ce5f826d52d922579936c4644f
+_md5_=a3c3069d0d99673760951350ef0b38cd
diff --git a/metadata/md5-cache/sci-physics/clhep-2.4.0.4 b/metadata/md5-cache/sci-physics/clhep-2.4.0.4
index e753dc539991..2c2225048b4f 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.4.0.4
+++ b/metadata/md5-cache/sci-physics/clhep-2.4.0.4
@@ -6,7 +6,8 @@ HOMEPAGE=http://proj-clhep.web.cern.ch/proj-clhep/
 IUSE=doc test threads
 KEYWORDS=amd64 hppa ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
+RESTRICT=!test? ( test )
 SLOT=2/2.4.0.4
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.4.0.4.tgz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44ace496feafe8801e6b5399e533fa97
+_md5_=316c1b5fbc432283fad753d599432223
diff --git a/metadata/md5-cache/sci-physics/clhep-2.4.1.2 b/metadata/md5-cache/sci-physics/clhep-2.4.1.2
index 389743038c65..6f5bd2398120 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.4.1.2
+++ b/metadata/md5-cache/sci-physics/clhep-2.4.1.2
@@ -6,7 +6,8 @@ HOMEPAGE=http://proj-clhep.web.cern.ch/proj-clhep/
 IUSE=doc test threads
 KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
+RESTRICT=!test? ( test )
 SLOT=2/2.4.1.2
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.1.2.tgz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca02f976a8b50cd74b1ab04bc1b08897
+_md5_=9cb44957d4bd073f4957a43ade4d10b5
diff --git a/metadata/md5-cache/sci-physics/espresso++-2.0.2 b/metadata/md5-cache/sci-physics/espresso++-2.0.2
index cd7eb4a9bae6..603c72b5e254 100644
--- a/metadata/md5-cache/sci-physics/espresso++-2.0.2
+++ b/metadata/md5-cache/sci-physics/espresso++-2.0.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-macos
 LICENSE=GPL-3
 RDEPEND=python_targets_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(-)] virtual/mpi dev-libs/boost:=[python,mpi,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/fftw:3.0 >=dev-python/mpi4py-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressopp/espressopp/archive/v2.0.2.tar.gz -> espresso++-2.0.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=02f82ea064998ccb8832832357808c6e
+_md5_=364c47cd38820b71b196af75fb58545a
diff --git a/metadata/md5-cache/sci-physics/espresso++-9999 b/metadata/md5-cache/sci-physics/espresso++-9999
index 9ec1efe722d4..ef4501aaef8f 100644
--- a/metadata/md5-cache/sci-physics/espresso++-9999
+++ b/metadata/md5-cache/sci-physics/espresso++-9999
@@ -8,6 +8,7 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=python_targets_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(-)] virtual/mpi dev-libs/boost:=[python,mpi,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/fftw:3.0 >=dev-python/mpi4py-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbc611349be2ce472be2af2a4ffa9b63
+_md5_=364c47cd38820b71b196af75fb58545a
diff --git a/metadata/md5-cache/sci-physics/espresso-4.0.0-r1 b/metadata/md5-cache/sci-physics/espresso-4.0.0-r1
index 0eb718fd8126..270f7ba88834 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.0.0-r1
+++ b/metadata/md5-cache/sci-physics/espresso-4.0.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-macos
 LICENSE=GPL-3
 RDEPEND=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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/cython-0.26.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) dev-libs/boost:=[mpi] hdf5? ( sci-libs/hdf5:=[mpi] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressomd/espresso/releases/download/4.0.0/espresso-4.0.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=248407bfa0df02980968c1f6ef1f391f
+_md5_=484a31bea1cc80c3b982e4ecfee401ad
diff --git a/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228 b/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228
index 0fdfb1481d81..a726ea740b3f 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228
+++ b/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-macos
 LICENSE=GPL-3
 RDEPEND=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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >dev-python/cython-0.22[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) dev-libs/boost:=[mpi] hdf5? ( sci-libs/hdf5:=[cxx] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressomd/espresso/archive/8a021f5e8b1d508f356f4419d360bd9dfb7fec2c.tar.gz -> espresso-4.0_pre20170228.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91ffc280a6406b45d3b1ad560d39ed19
+_md5_=d4d4d47f618cbe11bf1c5ebafa9cc5fa
diff --git a/metadata/md5-cache/sci-physics/espresso-9999 b/metadata/md5-cache/sci-physics/espresso-9999
index 38d93a3a61cd..a9d9b7c634e2 100644
--- a/metadata/md5-cache/sci-physics/espresso-9999
+++ b/metadata/md5-cache/sci-physics/espresso-9999
@@ -8,6 +8,7 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/cython-0.26.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) dev-libs/boost:=[mpi] hdf5? ( sci-libs/hdf5:=[mpi] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=495d7404af5a83cfb61f5b16b09e759e
+_md5_=2e07f0e359b1ae477da4f1d4bda2dd61
diff --git a/metadata/md5-cache/sci-physics/hepmc-2.06.09-r1 b/metadata/md5-cache/sci-physics/hepmc-2.06.09-r1
index 3543b88a3ef2..f3d7cca3133c 100644
--- a/metadata/md5-cache/sci-physics/hepmc-2.06.09-r1
+++ b/metadata/md5-cache/sci-physics/hepmc-2.06.09-r1
@@ -6,7 +6,8 @@ HOMEPAGE=https://hepmc.web.cern.ch/hepmc/
 IUSE=cm doc examples gev static-libs test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-2.06.09.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b80a8849a7c17817458185dd89885138
+_md5_=9fa73ce626a1ceb8303e5930ab581f20
diff --git a/metadata/md5-cache/sci-physics/lammps-20170901 b/metadata/md5-cache/sci-physics/lammps-20170901
index 7cc52935d274..937a01c75ce4 100644
--- a/metadata/md5-cache/sci-physics/lammps-20170901
+++ b/metadata/md5-cache/sci-physics/lammps-20170901
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_1Sep2017.tar.gz -> lammps-patch_1Sep2017.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=105df9423794c56a84e6f89d02d63dac
+_md5_=62a86d724c0b6c82fddd47e972c8ca90
diff --git a/metadata/md5-cache/sci-physics/lammps-20170901-r1 b/metadata/md5-cache/sci-physics/lammps-20170901-r1
index fa7ba5caaf5f..27b3f205b315 100644
--- a/metadata/md5-cache/sci-physics/lammps-20170901-r1
+++ b/metadata/md5-cache/sci-physics/lammps-20170901-r1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_1Sep2017.tar.gz -> lammps-patch_1Sep2017.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=903475e4ed4c4de6f31c7cb1a58f19b2
+_md5_=1faf10ad1b2ee3c90fcd728ed7a9f69c
diff --git a/metadata/md5-cache/sci-physics/lammps-20180117 b/metadata/md5-cache/sci-physics/lammps-20180117
index 981b2eab0741..ab9e41f0feaa 100644
--- a/metadata/md5-cache/sci-physics/lammps-20180117
+++ b/metadata/md5-cache/sci-physics/lammps-20180117
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_17Jan2018.tar.gz -> lammps-patch_17Jan2018.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=903475e4ed4c4de6f31c7cb1a58f19b2
+_md5_=1faf10ad1b2ee3c90fcd728ed7a9f69c
diff --git a/metadata/md5-cache/sci-physics/lammps-20180222 b/metadata/md5-cache/sci-physics/lammps-20180222
index c9ef360accad..a337f3f85442 100644
--- a/metadata/md5-cache/sci-physics/lammps-20180222
+++ b/metadata/md5-cache/sci-physics/lammps-20180222
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_22Feb2018.tar.gz -> lammps-patch_22Feb2018.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=903475e4ed4c4de6f31c7cb1a58f19b2
+_md5_=1faf10ad1b2ee3c90fcd728ed7a9f69c
diff --git a/metadata/md5-cache/sci-physics/lammps-20180308 b/metadata/md5-cache/sci-physics/lammps-20180308
index 6caec183cad6..98b746e2d9c1 100644
--- a/metadata/md5-cache/sci-physics/lammps-20180308
+++ b/metadata/md5-cache/sci-physics/lammps-20180308
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_8Mar2018.tar.gz -> lammps-patch_8Mar2018.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=903475e4ed4c4de6f31c7cb1a58f19b2
+_md5_=1faf10ad1b2ee3c90fcd728ed7a9f69c
diff --git a/metadata/md5-cache/sci-physics/lammps-20180316 b/metadata/md5-cache/sci-physics/lammps-20180316
index 9cf6b526e8dd..70c70f97fae7 100644
--- a/metadata/md5-cache/sci-physics/lammps-20180316
+++ b/metadata/md5-cache/sci-physics/lammps-20180316
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_16Mar2018.tar.gz -> lammps-patch_16Mar2018.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89806d5b50257df04be190367ec4aeaf
+_md5_=8ff08810f2aedf01a70a008c8fe6e843
diff --git a/metadata/md5-cache/sci-physics/lammps-20180822 b/metadata/md5-cache/sci-physics/lammps-20180822
index 9b63b05cfa54..47137bf232e9 100644
--- a/metadata/md5-cache/sci-physics/lammps-20180822
+++ b/metadata/md5-cache/sci-physics/lammps-20180822
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_22Aug2018.tar.gz -> lammps-patch_22Aug2018.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b7001fe8bffeb1dd6175c4b134e0b35
+_md5_=5e948c8b7e0b92f3c74b654253586239
diff --git a/metadata/md5-cache/sci-physics/lammps-20181212 b/metadata/md5-cache/sci-physics/lammps-20181212
index b1d6807d136b..69c1ff74338c 100644
--- a/metadata/md5-cache/sci-physics/lammps-20181212
+++ b/metadata/md5-cache/sci-physics/lammps-20181212
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_12Dec2018.tar.gz -> lammps-patch_12Dec2018.tar.gz test? ( https://github.com/lammps/lammps-testing/archive/7869c75cac38cb8a3d2ef7747ea12ec5812f5151.tar.gz -> lammps-testing-7869c75cac38cb8a3d2ef7747ea12ec5812f5151.tar.gz )
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=251a79417a0260db3905f5f5e7d8e6f5
+_md5_=092635a63b9f265d35075464a261ad11
diff --git a/metadata/md5-cache/sci-physics/lammps-20190605 b/metadata/md5-cache/sci-physics/lammps-20190605
index de048c5aec0e..21d16a055929 100644
--- a/metadata/md5-cache/sci-physics/lammps-20190605
+++ b/metadata/md5-cache/sci-physics/lammps-20190605
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_5Jun2019.tar.gz -> lammps-patch_5Jun2019.tar.gz test? ( https://github.com/lammps/lammps-testing/archive/827be7af84ca100d394ea1cf6d3bc49f6a8eef92.tar.gz -> lammps-testing-827be7af84ca100d394ea1cf6d3bc49f6a8eef92.tar.gz )
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fefa58309f1dde728a6e7d24a3698058
+_md5_=7d259f0d2d3724c3dff539697b8c2294
diff --git a/metadata/md5-cache/sci-physics/lammps-20190807 b/metadata/md5-cache/sci-physics/lammps-20190807
index 16c1fb8ee9d7..c2bc211dc8e8 100644
--- a/metadata/md5-cache/sci-physics/lammps-20190807
+++ b/metadata/md5-cache/sci-physics/lammps-20190807
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5[mpi] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0 netcdf? ( sci-libs/netcdf ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lammps/lammps/archive/patch_7Aug2019.tar.gz -> lammps-patch_7Aug2019.tar.gz test? ( https://github.com/lammps/lammps-testing/archive/d0394a77fa2b4b2d545a73ea092cf6de7616aac8.tar.gz -> lammps-testing-d0394a77fa2b4b2d545a73ea092cf6de7616aac8.tar.gz )
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94fbb5763e5732086a3e80fd2a4380fd
+_md5_=65ac5d1e713cec104cdafc79f0f37e52
diff --git a/metadata/md5-cache/sci-physics/lhapdf-5.9.1 b/metadata/md5-cache/sci-physics/lhapdf-5.9.1
index 35ef8c674546..bb1ba1e00aae 100644
--- a/metadata/md5-cache/sci-physics/lhapdf-5.9.1
+++ b/metadata/md5-cache/sci-physics/lhapdf-5.9.1
@@ -7,7 +7,8 @@ IUSE=cxx doc examples octave python test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=octave? ( sci-mathematics/octave )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.hepforge.org/archive/lhapdf/lhapdf-5.9.1.tar.gz test? ( http://lhapdf.hepforge.org/svn/pdfsets/5/CT10.LHgrid http://lhapdf.hepforge.org/svn/pdfsets/5/cteq61.LHgrid http://lhapdf.hepforge.org/svn/pdfsets/5/MRST2004nlo.LHgrid http://lhapdf.hepforge.org/svn/pdfsets/5/cteq61.LHpdf octave? ( http://lhapdf.hepforge.org/svn/pdfsets/5/cteq5l.LHgrid ) )
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d84cb88d57df7d84d0a5aea1fe22930e
+_md5_=99d0886aaec88a47a08d5f9e246baacd
diff --git a/metadata/md5-cache/sci-physics/pythia-8.2.10 b/metadata/md5-cache/sci-physics/pythia-8.2.10
index 6802f6d39e07..8d842423a6ed 100644
--- a/metadata/md5-cache/sci-physics/pythia-8.2.10
+++ b/metadata/md5-cache/sci-physics/pythia-8.2.10
@@ -7,7 +7,8 @@ IUSE=doc examples gzip +hepmc fastjet lhapdf root static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=fastjet? ( >=sci-physics/fastjet-3 ) gzip? ( sys-libs/zlib ) hepmc? ( sci-physics/hepmc:0= ) lhapdf? ( >=sci-physics/lhapdf-6:= )
+RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=http://home.thep.lu.se/~torbjorn/pythia8/pythia8210.tgz test? ( lhapdf? ( https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/CT10.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/MRST2007lomod.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF23_nlo_as_0119_qed_mc.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF23_nnlo_as_0119_qed_mc.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/cteq66.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/cteq6l1.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/unvalidated/MRST2004qed.tar.gz ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f9759cc51da205cb2e3845d0d67d6e8e
+_md5_=5dd00df0c2a52ba129c32853522fa055
diff --git a/metadata/md5-cache/sci-physics/pythia-8.2.26 b/metadata/md5-cache/sci-physics/pythia-8.2.26
index 4f59d8a64ddd..573b2e01c007 100644
--- a/metadata/md5-cache/sci-physics/pythia-8.2.26
+++ b/metadata/md5-cache/sci-physics/pythia-8.2.26
@@ -7,7 +7,8 @@ IUSE=doc examples gzip +hepmc fastjet lhapdf root static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=fastjet? ( >=sci-physics/fastjet-3 ) gzip? ( sys-libs/zlib ) hepmc? ( sci-physics/hepmc:0= ) lhapdf? ( >=sci-physics/lhapdf-6:= )
+RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=http://home.thep.lu.se/~torbjorn/pythia8/pythia8226.tgz test? ( lhapdf? ( https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/CT10.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/MRST2007lomod.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF23_nlo_as_0119_qed_mc.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF23_nnlo_as_0119_qed_mc.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/cteq66.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/cteq6l1.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/unvalidated/MRST2004qed.tar.gz ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e438397d00b04d0166239db2cc5fc4d1
+_md5_=d3b6cf3fcba4aa505eedabe58d51f8b4
diff --git a/metadata/md5-cache/sci-physics/qutip-4.2.0 b/metadata/md5-cache/sci-physics/qutip-4.2.0
index c7a241d1f4b5..7ab6205f5b47 100644
--- a/metadata/md5-cache/sci-physics/qutip-4.2.0
+++ b/metadata/md5-cache/sci-physics/qutip-4.2.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qutip/qutip/archive/v4.2.0.tar.gz -> qutip-4.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b41fa1f421d692b573b3ab739610d67d
+_md5_=5c9c2dd9964db094648c65150109d38f
diff --git a/metadata/md5-cache/sci-physics/thepeg-1.9.2 b/metadata/md5-cache/sci-physics/thepeg-1.9.2
index 2ff9067a296c..6c9126b5a678 100644
--- a/metadata/md5-cache/sci-physics/thepeg-1.9.2
+++ b/metadata/md5-cache/sci-physics/thepeg-1.9.2
@@ -7,7 +7,8 @@ IUSE=c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib elibc_Fre
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sci-libs/gsl:0= emacs? ( virtual/emacs ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( sci-physics/lhapdf:0= ) rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=http://www.hepforge.org/archive/thepeg/ThePEG-1.9.2.tar.bz2 test? ( hepmc? ( http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1ff9d66a22875ebc2e69333d2181f1a6
+_md5_=c8f518b11f2f73178b6b2599f402dcb0
diff --git a/metadata/md5-cache/sci-physics/thepeg-2.0.0 b/metadata/md5-cache/sci-physics/thepeg-2.0.0
index 3ea997457326..f33b6a343dbd 100644
--- a/metadata/md5-cache/sci-physics/thepeg-2.0.0
+++ b/metadata/md5-cache/sci-physics/thepeg-2.0.0
@@ -7,7 +7,8 @@ IUSE=c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib elibc_Fre
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sci-libs/gsl:0= emacs? ( virtual/emacs ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( sci-physics/lhapdf:0= ) rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=http://www.hepforge.org/archive/thepeg/ThePEG-2.0.0.tar.bz2 test? ( hepmc? ( http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=87d163eebe90a3bb1e6b97b8d76db7e0
+_md5_=5c62b96a00ce2708d87eb9196aac76bb
diff --git a/metadata/md5-cache/sci-physics/thepeg-2.0.4 b/metadata/md5-cache/sci-physics/thepeg-2.0.4
index 4889a2e1f166..c56fabcaa09b 100644
--- a/metadata/md5-cache/sci-physics/thepeg-2.0.4
+++ b/metadata/md5-cache/sci-physics/thepeg-2.0.4
@@ -7,7 +7,8 @@ IUSE=c++11 emacs fastjet hepmc java lhapdf rivet static-libs test zlib elibc_Fre
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sci-libs/gsl:0= emacs? ( virtual/emacs ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5:* ) lhapdf? ( >=sci-physics/lhapdf-6.0:0= ) rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=http://www.hepforge.org/archive/thepeg/ThePEG-2.0.4.tar.bz2 test? ( hepmc? ( http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=65309ea32f9b93340ddab14a97aec6b5
+_md5_=8c2e50f6bbb50e38f6175cde7c7d0779
diff --git a/metadata/md5-cache/sci-visualization/yt-3.3.5 b/metadata/md5-cache/sci-visualization/yt-3.3.5
index 33dbec02da3d..adb047d21b01 100644
--- a/metadata/md5-cache/sci-visualization/yt-3.3.5
+++ b/metadata/md5-cache/sci-visualization/yt-3.3.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sympy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yt/yt-3.3.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=837954b0a853093f2b74e8c017580065
+_md5_=2586641498a16ab265ee3e360a340e96
diff --git a/metadata/md5-cache/sci-visualization/yt-3.4.0 b/metadata/md5-cache/sci-visualization/yt-3.4.0
index c9f9ff3d823a..93a56b0f8240 100644
--- a/metadata/md5-cache/sci-visualization/yt-3.4.0
+++ b/metadata/md5-cache/sci-visualization/yt-3.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.10.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sympy-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] hub? ( dev-python/girder-client[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yt/yt-3.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1beeac7481015d6766be6590f406488c
+_md5_=f4623d1df61e83f8c13eb2072c59b038
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.30 b/metadata/md5-cache/sys-apps/coreutils-8.30
index eccf14c5478d..647f9670961a 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.30
+++ b/metadata/md5-cache/sys-apps/coreutils-8.30
@@ -7,7 +7,8 @@ IUSE=acl caps gmp hostname kill multicall nls selinux +split-usr static test use
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.30.tar.xz mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=16d4658b4c803256e894a62367db2126
+_md5_=c68d2ef2177a5ffb0d3a4f30d4a14e2f
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.31 b/metadata/md5-cache/sys-apps/coreutils-8.31
index b247039028ba..9a5bb63699cb 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.31
+++ b/metadata/md5-cache/sys-apps/coreutils-8.31
@@ -7,7 +7,8 @@ IUSE=acl caps gmp hostname kill multicall nls selinux +split-usr static test use
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.31.tar.xz mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9d0362cc808a7d20bc09d74d2fb445e
+_md5_=0612f9573f155a2e51f52371ce8e4a57
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.31-r1 b/metadata/md5-cache/sys-apps/coreutils-8.31-r1
index 68afb96943ed..47afe77c1e13 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.31-r1
+++ b/metadata/md5-cache/sys-apps/coreutils-8.31-r1
@@ -7,7 +7,8 @@ IUSE=acl caps gmp hostname kill multicall nls selinux +split-usr static test van
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.31.tar.xz mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cbe18a635c746c73995cfb52d3577088
+_md5_=d4b0e9276bd1e98dc547c1ac5e47a9dc
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.16 b/metadata/md5-cache/sys-apps/dbus-1.12.16
index 7665904ed707..37b94e32fba9 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.12.16
+++ b/metadata/md5-cache/sys-apps/dbus-1.12.16
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=|| ( AFL-2.1 GPL-2 )
 RDEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) acct-user/messagebus selinux? ( sec-policy/selinux-dbus )
 REQUIRED_USE=?? ( elogind systemd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.12.16.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=0467234f57c718c631355ebe513a0545
+_md5_=eb3db8ba766626e81ece89fd1933d31d
diff --git a/metadata/md5-cache/sys-apps/ethq-0.5.0 b/metadata/md5-cache/sys-apps/ethq-0.5.0
index 27a0343c13f3..c67d480f8be9 100644
--- a/metadata/md5-cache/sys-apps/ethq-0.5.0
+++ b/metadata/md5-cache/sys-apps/ethq-0.5.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=sys-libs/ncurses:0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/isc-projects/ethq/archive/v0_5_0.tar.gz -> ethq-0_5_0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=86a15b7f328800baf64f72e243a5b701
+_md5_=28a5fa1d1fd9dde08aa15d0bc02fa468
diff --git a/metadata/md5-cache/sys-apps/ethq-0.6.1 b/metadata/md5-cache/sys-apps/ethq-0.6.1
index b89376299028..2925c652fa12 100644
--- a/metadata/md5-cache/sys-apps/ethq-0.6.1
+++ b/metadata/md5-cache/sys-apps/ethq-0.6.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=sys-libs/ncurses:0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/isc-projects/ethq/archive/v0_6_1.tar.gz -> ethq-0_6_1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=75174c3c61b70662e440767122014adb
+_md5_=ec58b58325ad7d688a046b0456b0f47a
diff --git a/metadata/md5-cache/sys-apps/ethq-9999 b/metadata/md5-cache/sys-apps/ethq-9999
index f50c11c54406..49f0877282be 100644
--- a/metadata/md5-cache/sys-apps/ethq-9999
+++ b/metadata/md5-cache/sys-apps/ethq-9999
@@ -8,6 +8,7 @@ IUSE=test
 LICENSE=MPL-2.0
 PROPERTIES=live
 RDEPEND=sys-libs/ncurses:0
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c7af9fbbbf41de8e7714ef8b78e2e67a
+_md5_=0b58a8fcc7913bb206056d04092ba90d
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.22 b/metadata/md5-cache/sys-apps/fakeroot-1.22
index 5662ccd4644c..ac22226c26ba 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.22
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.22
@@ -6,7 +6,8 @@ HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
 IUSE=acl debug static-libs test
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.22.orig.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ba5c2a4d9a2f393b49099bb5bf54f2b0
+_md5_=21f68aea69d462999c9f9295b67811db
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.23 b/metadata/md5-cache/sys-apps/fakeroot-1.23
index d5624782333a..e7b6d0fb8eee 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.23
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.23
@@ -6,7 +6,8 @@ HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
 IUSE=acl debug static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.23.orig.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf7ede58666de0d750fbc0729f0b4c4e
+_md5_=6537f5d3b4bf9ffe05b690be073412e2
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.24 b/metadata/md5-cache/sys-apps/fakeroot-1.24
index 1c07a7f98a97..a46b39da993f 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.24
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.24
@@ -7,7 +7,8 @@ HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
 IUSE=acl debug static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.24.orig.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cac7d9b96e20c835fb527a8eaf0103af
+_md5_=7f71eea1c3efe6ecae59e7795b6960cc
diff --git a/metadata/md5-cache/sys-apps/findutils-4.6.0-r1 b/metadata/md5-cache/sys-apps/findutils-4.6.0-r1
index d48f49060a63..8e71a93fbb5e 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.6.0-r1
+++ b/metadata/md5-cache/sys-apps/findutils-4.6.0-r1
@@ -7,7 +7,8 @@ IUSE=nls selinux static test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/findutils/findutils-4.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1aa22f08a9235825f62cdcd529e08712
+_md5_=243d69f7cb285b42f1f148df0f69e9d4
diff --git a/metadata/md5-cache/sys-apps/findutils-4.7.0 b/metadata/md5-cache/sys-apps/findutils-4.7.0
index b18b98954577..a2c5e943442b 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.7.0
+++ b/metadata/md5-cache/sys-apps/findutils-4.7.0
@@ -8,7 +8,8 @@ IUSE=nls selinux static test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/findutils/findutils-4.7.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1a7d00d57d90e0b7c0cfb66751da96d1
+_md5_=cb56d938428b2b08d8d38725ad5e17b8
diff --git a/metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2 b/metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2
index c614b029508b..c31e5be63c1f 100644
--- a/metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2
+++ b/metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2
@@ -7,6 +7,7 @@ IUSE=apparmor +globalcfg +network +seccomp +suid +userns test +whitelist
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=apparmor? ( sys-libs/libapparmor )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netblue30/firejail/archive/0.9.56.2-LTS.tar.gz -> firejail-lts-0.9.56.2.tar.gz
-_md5_=c3c0f4fa189862bf9fafc46c9cc6c466
+_md5_=492c7cd80a03a0df461ebcd8026df18f
diff --git a/metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2-r1 b/metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2-r1
index 18e96569ebf7..73d2e24a24b9 100644
--- a/metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2-r1
+++ b/metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2-r1
@@ -7,6 +7,7 @@ IUSE=apparmor +globalcfg +network +seccomp +suid +userns test +whitelist
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=apparmor? ( sys-libs/libapparmor )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netblue30/firejail/archive/0.9.56.2-LTS.tar.gz -> firejail-lts-0.9.56.2.tar.gz
-_md5_=e3dedefcb9a14eeaf59ea72b1b8a4037
+_md5_=ad292a8cd32136c58817059ada768c70
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.2.11 b/metadata/md5-cache/sys-apps/fwupd-1.2.11
index a49f713fc6f0..9120bb616324 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.2.11
+++ b/metadata/md5-cache/sys-apps/fwupd-1.2.11
@@ -10,7 +10,8 @@ LICENSE=LGPL-2.1+
 PDEPEND=sys-apps/dbus
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.7 dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo )
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ^^ ( consolekit elogind systemd ) dell? ( uefi )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.2.11.tar.gz -> fwupd-1.2.11.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1b8e648333f1a0bf80d6db0048ed80e
+_md5_=ffb32375fc77c2e4dcc9a3fe6143aae3
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.2.8 b/metadata/md5-cache/sys-apps/fwupd-1.2.8
index 4424b026c70f..09e75b5332d0 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.2.8
+++ b/metadata/md5-cache/sys-apps/fwupd-1.2.8
@@ -10,7 +10,8 @@ LICENSE=LGPL-2.1+
 PDEPEND=sys-apps/dbus
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.7 dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo )
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ^^ ( consolekit elogind systemd ) dell? ( uefi )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.2.8.tar.gz -> fwupd-1.2.8.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c7ce4c7b489e72a9c2e659e23a12d245
+_md5_=faf6e02d458c302a5bad817028318a47
diff --git a/metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2 b/metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2
index 2bbd7d4cb708..f1436284a6cb 100644
--- a/metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2
+++ b/metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB
 RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/libpcre:3 sys-apps/smartmontools x11-apps/xmessage
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gsmartcontrol/gsmartcontrol-1.0.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e60d8cbd7421e4494b76a37135f8e4d4
+_md5_=2204079df105d67ec374ee194c36606b
diff --git a/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.3 b/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.3
index 2daf32ea025f..4b1994edc4b9 100644
--- a/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.3
+++ b/metadata/md5-cache/sys-apps/gsmartcontrol-1.1.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB
 RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/libpcre:3 sys-apps/smartmontools x11-apps/xmessage
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gsmartcontrol/gsmartcontrol-1.1.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4fd8c4bdbf8068f85133ce01a9c4b4c3
+_md5_=2204079df105d67ec374ee194c36606b
diff --git a/metadata/md5-cache/sys-apps/kbd-2.0.4 b/metadata/md5-cache/sys-apps/kbd-2.0.4
index a1d819c33d1a..8dbdd1a89315 100644
--- a/metadata/md5-cache/sys-apps/kbd-2.0.4
+++ b/metadata/md5-cache/sys-apps/kbd-2.0.4
@@ -7,7 +7,8 @@ IUSE=nls pam test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=pam? ( sys-libs/pam ) app-arch/gzip
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dab8837b7f72f2c397273c37c0c36d74
+_md5_=f899accba2131d89e3a6543cd230b41f
diff --git a/metadata/md5-cache/sys-apps/kbd-2.0.4-r1 b/metadata/md5-cache/sys-apps/kbd-2.0.4-r1
index 517fb35cedbe..41a484dabaaa 100644
--- a/metadata/md5-cache/sys-apps/kbd-2.0.4-r1
+++ b/metadata/md5-cache/sys-apps/kbd-2.0.4-r1
@@ -8,7 +8,8 @@ IUSE=nls pam test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.4.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ba77cef122f1eeb6a8eb3c5a1c795c1d
+_md5_=e979d0de579b8266831647d2b5b4cdb8
diff --git a/metadata/md5-cache/sys-apps/kbd-2.2.0-r2 b/metadata/md5-cache/sys-apps/kbd-2.2.0-r2
index d6a6638cc177..2b6390cd6aaf 100644
--- a/metadata/md5-cache/sys-apps/kbd-2.2.0-r2
+++ b/metadata/md5-cache/sys-apps/kbd-2.2.0-r2
@@ -8,7 +8,8 @@ IUSE=nls pam test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.2.0.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=08d3e1881b96c134894596d5c4bf5f95
+_md5_=fa001d34cf8f560b391011aef8c7b136
diff --git a/metadata/md5-cache/sys-apps/kbd-9999 b/metadata/md5-cache/sys-apps/kbd-9999
index 8598bb0dab61..bfe14ee5be43 100644
--- a/metadata/md5-cache/sys-apps/kbd-9999
+++ b/metadata/md5-cache/sys-apps/kbd-9999
@@ -8,6 +8,7 @@ IUSE=nls pam test
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c90fb569302b0b809fad25f8ecb50354
+_md5_=122ddd19287133eb52363412b22313a8
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.6.1 b/metadata/md5-cache/sys-apps/keyutils-1.6.1
index b39612caacd1..614afd12ee2c 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.6.1
+++ b/metadata/md5-cache/sys-apps/keyutils-1.6.1
@@ -6,7 +6,8 @@ HOMEPAGE=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git
 IUSE=static static-libs test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
+RESTRICT=!test? ( test )
 SLOT=0/1.9
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-1.6.1.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=6e64d4810b36216748aa0623887bf9fa
+_md5_=d4331b4753bfe5699c93a788f963f5bd
diff --git a/metadata/md5-cache/sys-apps/lmctfy-0.2.0 b/metadata/md5-cache/sys-apps/lmctfy-0.2.0
index 094450e15f97..f5278c8a3f98 100644
--- a/metadata/md5-cache/sys-apps/lmctfy-0.2.0
+++ b/metadata/md5-cache/sys-apps/lmctfy-0.2.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/lmctfy/archive/0.2.0.tar.gz -> lmctfy-0.2.0.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_=beac9951888664fe378c6acb0d4b21ff
+_md5_=fbfabc1ed3ff4ddcdb9a48e12d4b1ba8
diff --git a/metadata/md5-cache/sys-apps/lmctfy-0.3.0 b/metadata/md5-cache/sys-apps/lmctfy-0.3.0
index e5b4742c19f1..92f3f5e618a5 100644
--- a/metadata/md5-cache/sys-apps/lmctfy-0.3.0
+++ b/metadata/md5-cache/sys-apps/lmctfy-0.3.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/lmctfy/archive/0.3.0.tar.gz -> lmctfy-0.3.0.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_=0bdbf7567f4d957c906f4000e336681b
+_md5_=fbfabc1ed3ff4ddcdb9a48e12d4b1ba8
diff --git a/metadata/md5-cache/sys-apps/lmctfy-0.3.1 b/metadata/md5-cache/sys-apps/lmctfy-0.3.1
index 48344bf8d981..03a09d68e5c3 100644
--- a/metadata/md5-cache/sys-apps/lmctfy-0.3.1
+++ b/metadata/md5-cache/sys-apps/lmctfy-0.3.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/lmctfy/archive/0.3.1.tar.gz -> lmctfy-0.3.1.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_=0bdbf7567f4d957c906f4000e336681b
+_md5_=fbfabc1ed3ff4ddcdb9a48e12d4b1ba8
diff --git a/metadata/md5-cache/sys-apps/lmctfy-0.5.0 b/metadata/md5-cache/sys-apps/lmctfy-0.5.0
index d44540aa15fa..0eb2040acdac 100644
--- a/metadata/md5-cache/sys-apps/lmctfy-0.5.0
+++ b/metadata/md5-cache/sys-apps/lmctfy-0.5.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/protobuf >=dev-cpp/gflags-2.1.1 dev-libs/re2 dev-lang/go sys-libs/libapparmor
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/lmctfy/archive/0.5.0.tar.gz -> lmctfy-0.5.0.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_=cfc2593bbfaeae7ae91b3898b96a149c
+_md5_=a723aed3fe881a1e1d86061a1b9b3bc2
diff --git a/metadata/md5-cache/sys-apps/lmctfy-0.5.0-r1 b/metadata/md5-cache/sys-apps/lmctfy-0.5.0-r1
index a228a67e3de0..9c3d59e2b2ea 100644
--- a/metadata/md5-cache/sys-apps/lmctfy-0.5.0-r1
+++ b/metadata/md5-cache/sys-apps/lmctfy-0.5.0-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/protobuf >=dev-cpp/gflags-2.1.1 dev-libs/re2 sys-libs/libapparmor
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/lmctfy/archive/0.5.0.tar.gz -> lmctfy-0.5.0.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_=6e55dba0676ccc3ef2b72e20c6df3fb4
+_md5_=e4b033547c26c619e0345b73072d43ec
diff --git a/metadata/md5-cache/sys-apps/miller-5.3.0 b/metadata/md5-cache/sys-apps/miller-5.3.0
index e648ac011af0..7ec33368d1bd 100644
--- a/metadata/md5-cache/sys-apps/miller-5.3.0
+++ b/metadata/md5-cache/sys-apps/miller-5.3.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://johnkerl.org/miller/doc/index.html
 IUSE=doc test
 KEYWORDS=amd64 arm x86
 LICENSE=BSD-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/johnkerl/miller/archive/v5.3.0.tar.gz -> miller-5.3.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=97bc1d3d80df30c06d1e0cf8aa31fc52
+_md5_=4dc1581e19af79a70f6485eb070e91c8
diff --git a/metadata/md5-cache/sys-apps/minijail-9 b/metadata/md5-cache/sys-apps/minijail-9
index 64451e0e73b1..6bad3e318cab 100644
--- a/metadata/md5-cache/sys-apps/minijail-9
+++ b/metadata/md5-cache/sys-apps/minijail-9
@@ -7,7 +7,8 @@ IUSE=+seccomp test kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/libcap-ng:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/minijail/archive/linux-v9.tar.gz -> minijail-9.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b605d9da44456b32f34e5d2abd16d818
+_md5_=d674f55d033b892ec0af64e7ce8769e9
diff --git a/metadata/md5-cache/sys-apps/sydbox-1.0.7 b/metadata/md5-cache/sys-apps/sydbox-1.0.7
index 73c51bcc096a..d26a02ec9de5 100644
--- a/metadata/md5-cache/sys-apps/sydbox-1.0.7
+++ b/metadata/md5-cache/sys-apps/sydbox-1.0.7
@@ -7,6 +7,7 @@ IUSE=debug seccomp test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=sys-libs/pinktrace:= debug? ( sys-libs/libunwind:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://distfiles.exherbo.org/distfiles/sydbox-1.0.7.tar.bz2
-_md5_=fe5029dfaefa1636b311a8c44539d276
+_md5_=3417e1da82a0ff0377cd9f86d85462a3
diff --git a/metadata/md5-cache/sys-apps/the_silver_searcher-2.0.0 b/metadata/md5-cache/sys-apps/the_silver_searcher-2.0.0
index 75275890280a..0809c9639126 100644
--- a/metadata/md5-cache/sys-apps/the_silver_searcher-2.0.0
+++ b/metadata/md5-cache/sys-apps/the_silver_searcher-2.0.0
@@ -7,7 +7,8 @@ IUSE=lzma test zlib
 KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/libpcre lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ggreer/the_silver_searcher/archive/2.0.0.tar.gz -> the_silver_searcher-2.0.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f8102913d0f789718afaf2298958f2bc
+_md5_=12d406ce17574b19bc090885a0bec065
diff --git a/metadata/md5-cache/sys-apps/the_silver_searcher-2.1.0 b/metadata/md5-cache/sys-apps/the_silver_searcher-2.1.0
index bc8e71af07b1..e647fb7a93e8 100644
--- a/metadata/md5-cache/sys-apps/the_silver_searcher-2.1.0
+++ b/metadata/md5-cache/sys-apps/the_silver_searcher-2.1.0
@@ -7,7 +7,8 @@ IUSE=lzma test zlib
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/libpcre lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ggreer/the_silver_searcher/archive/2.1.0.tar.gz -> the_silver_searcher-2.1.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e5f6f49bb25cb8d02b1180672e2a7c4c
+_md5_=8214cd46631134b7811cc74ecbe6d162
diff --git a/metadata/md5-cache/sys-auth/authenticator-0.2.4 b/metadata/md5-cache/sys-auth/authenticator-0.2.4
index f6354abad348..492796efed98 100644
--- a/metadata/md5-cache/sys-auth/authenticator-0.2.4
+++ b/metadata/md5-cache/sys-auth/authenticator-0.2.4
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/python-gnupg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/gd x11-libs/gtk+:3
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/Authenticator/-/archive/0.2.4/Authenticator-0.2.4.tar.gz -> authenticator-0.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ceaed4599b83bf081666d5636268912
+_md5_=d84e732b09eda46b93ab77e44bdeb6a2
diff --git a/metadata/md5-cache/sys-auth/authenticator-9999 b/metadata/md5-cache/sys-auth/authenticator-9999
index 4d908945fb74..da177cac3f65 100644
--- a/metadata/md5-cache/sys-auth/authenticator-9999
+++ b/metadata/md5-cache/sys-auth/authenticator-9999
@@ -8,6 +8,7 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/python-gnupg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/gd x11-libs/gtk+:3
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1f21f1eec6bfe2eab288c2549bf340e
+_md5_=ac91a6bdd7d497e2e6b98b190634a616
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.6 b/metadata/md5-cache/sys-auth/consolekit-0.4.6
index 1a3febe26862..2274ef415814 100644
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.6
+++ b/metadata/md5-cache/sys-auth/consolekit-0.4.6
@@ -7,7 +7,8 @@ IUSE=acl debug doc kernel_linux pam policykit selinux systemd-units test kernel_
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.38.2-r1:2= sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) pam? ( sys-libs/pam ) policykit? ( >=sys-auth/polkit-0.110 ) kernel_linux? ( sys-apps/coreutils[acl?] ) selinux? ( sec-policy/selinux-consolekit )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.6.tar.xz https://launchpad.net/debian/+archive/primary/+files/consolekit_0.4.6-4.debian.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=feae61170cf00f0b064e658bef2a1383
+_md5_=23322b9c3d3049f83b3972f0324cfa3a
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1 b/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
index d6b31bfe989b..4fe94f21118d 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
+++ b/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
@@ -7,7 +7,8 @@ IUSE=acl cgroups debug doc kernel_linux pam pm-utils policykit selinux test kern
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) pam? ( sys-libs/pam ) policykit? ( >=sys-auth/polkit-0.110 ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.1.0/ConsoleKit2-1.1.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9c583ef052ee5e0aeec15aacd24f6e96
+_md5_=5181bc6c22106904b67a8889c327d199
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.1.2 b/metadata/md5-cache/sys-auth/consolekit-1.1.2
index b52718c367f9..8e898a61749d 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.1.2
+++ b/metadata/md5-cache/sys-auth/consolekit-1.1.2
@@ -7,7 +7,8 @@ IUSE=acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux tes
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) evdev? ( dev-libs/libevdev:= ) udev? ( virtual/libudev x11-libs/libdrm:= ) pam? ( sys-libs/pam ) policykit? ( >=sys-auth/polkit-0.110 ) selinux? ( sys-libs/libselinux ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.1.2/ConsoleKit2-1.1.2.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cd0d56d4bd32a193a7770ba07bb6b75
+_md5_=68f144bd0a3a891a28f0108161160350
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.2.0 b/metadata/md5-cache/sys-auth/consolekit-1.2.0
index 0de5f6ed05bc..a7f8c291f0bc 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.2.0
+++ b/metadata/md5-cache/sys-auth/consolekit-1.2.0
@@ -7,7 +7,8 @@ IUSE=acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux tes
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) evdev? ( dev-libs/libevdev:= ) udev? ( virtual/libudev x11-libs/libdrm:= ) pam? ( sys-libs/pam ) policykit? ( >=sys-auth/polkit-0.110 ) selinux? ( sys-libs/libselinux ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.2.0/ConsoleKit2-1.2.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08a14e52a8b869f19c4fb03dbba9104e
+_md5_=f2a02ef0113e8b03c89a4f0caff98cf7
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.2.1 b/metadata/md5-cache/sys-auth/consolekit-1.2.1
index a86c0affab5d..19944977cc9e 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.2.1
+++ b/metadata/md5-cache/sys-auth/consolekit-1.2.1
@@ -7,7 +7,8 @@ IUSE=acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux tes
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) evdev? ( dev-libs/libevdev:= ) udev? ( virtual/libudev x11-libs/libdrm:= ) pam? ( sys-libs/pam ) policykit? ( >=sys-auth/polkit-0.110 ) selinux? ( sys-libs/libselinux ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.2.1/ConsoleKit2-1.2.1.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8bbd24de7cec6a531ee4b4d982ed7a1e
+_md5_=a90c7eee7862f317e655eb41e7fab501
diff --git a/metadata/md5-cache/sys-auth/consolekit-9999 b/metadata/md5-cache/sys-auth/consolekit-9999
index 7caec8d0671d..1558a1ac7a25 100644
--- a/metadata/md5-cache/sys-auth/consolekit-9999
+++ b/metadata/md5-cache/sys-auth/consolekit-9999
@@ -7,6 +7,7 @@ IUSE=acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux tes
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) evdev? ( dev-libs/libevdev:= ) udev? ( virtual/libudev x11-libs/libdrm:= ) pam? ( sys-libs/pam ) policykit? ( >=sys-auth/polkit-0.110 ) selinux? ( sys-libs/libselinux ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8aa14f53174d5eacff73123eae1995bf
+_md5_=1af2ae07fe311b41d747972c8cd5da94
diff --git a/metadata/md5-cache/sys-auth/keystone-14.1.0-r1 b/metadata/md5-cache/sys-auth/keystone-14.1.0-r1
index 5ccfa3372d10..cea9251a1a54 100644
--- a/metadata/md5-cache/sys-auth/keystone-14.1.0-r1
+++ b/metadata/md5-cache/sys-auth/keystone-14.1.0-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.38.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ldap? ( >=dev-python/python-ldap-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ldappool-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-14.1.0 https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-14.1.0 https://tarballs.openstack.org/keystone/keystone-14.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac7cd004b281fce2f136d6f767dda511
+_md5_=e25edf4b5ffcb8f00e4d59a39266f1ee
diff --git a/metadata/md5-cache/sys-auth/keystone-15.0.0 b/metadata/md5-cache/sys-auth/keystone-15.0.0
index d541a8e065e2..7fbc888180f9 100644
--- a/metadata/md5-cache/sys-auth/keystone-15.0.0
+++ b/metadata/md5-cache/sys-auth/keystone-15.0.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-5.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.38.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.43.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyjwt-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/msgpack-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ldap? ( >=dev-python/python-ldap-3.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ldappool-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/stein/keystone.conf.sample -> keystone.conf.sample-15.0.0 https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/stein/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-15.0.0 https://tarballs.openstack.org/keystone/keystone-15.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=1cad24edaf28e6da031a616e99434b36
+_md5_=a92915a4292f56ff2d2454ff85028853
diff --git a/metadata/md5-cache/sys-auth/keystone-16.0.0 b/metadata/md5-cache/sys-auth/keystone-16.0.0
index 6e988d0af5f1..62f1dc3ab0aa 100644
--- a/metadata/md5-cache/sys-auth/keystone-16.0.0
+++ b/metadata/md5-cache/sys-auth/keystone-16.0.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-7.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.44.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-2.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyjwt-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/msgpack-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ldap? ( >=dev-python/python-ldap-3.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ldappool-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/train/keystone.conf.sample -> keystone.conf.sample-16.0.0 https://tarballs.openstack.org/keystone/keystone-16.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=adcc43e9b2d8e09d86aba9315aeae5cf
+_md5_=3d0f71251354895fe562c96f739858a3
diff --git a/metadata/md5-cache/sys-auth/keystone-2018.2.9999 b/metadata/md5-cache/sys-auth/keystone-2018.2.9999
index 9f6b68e8bb5b..fc13e2f775dd 100644
--- a/metadata/md5-cache/sys-auth/keystone-2018.2.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2018.2.9999
@@ -8,7 +8,8 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.38.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ldap? ( >=dev-python/python-ldap-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ldappool-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-2018.2.9999 https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-2018.2.9999
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4281cc6ec8a533025b5ee6ae5f0ae7ef
+_md5_=51713d437f571a171cccc3a24be2e5ac
diff --git a/metadata/md5-cache/sys-auth/keystone-2019.1.9999 b/metadata/md5-cache/sys-auth/keystone-2019.1.9999
index 0d9303700599..d64ebfcbce8d 100644
--- a/metadata/md5-cache/sys-auth/keystone-2019.1.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2019.1.9999
@@ -9,7 +9,8 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-5.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.38.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.43.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyjwt-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/msgpack-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ldap? ( >=dev-python/python-ldap-3.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ldappool-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/stein/keystone.conf.sample -> keystone.conf.sample-2019.1.9999 https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/stein/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-2019.1.9999
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7981763fb074be457e192e877dd33f2b
+_md5_=751da261c1391186bf1777c163603dcb
diff --git a/metadata/md5-cache/sys-auth/keystone-2019.2.9999 b/metadata/md5-cache/sys-auth/keystone-2019.2.9999
index 01f4383e7e8b..ee1c686c598f 100644
--- a/metadata/md5-cache/sys-auth/keystone-2019.2.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2019.2.9999
@@ -9,7 +9,8 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-7.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.44.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-2.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyjwt-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/msgpack-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ldap? ( >=dev-python/python-ldap-3.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ldappool-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/train/keystone.conf.sample -> keystone.conf.sample-2019.2.9999
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	git-r3	6d22636df236df4cc8475f7b7668bdcd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=b441bfb5290f0eef32ac9a626fac8b62
+_md5_=5ba9a2ec10a84ec01fceb2910e61fa74
diff --git a/metadata/md5-cache/sys-auth/nss-mdns-0.13 b/metadata/md5-cache/sys-auth/nss-mdns-0.13
index 9b8315d6f9c2..7b98fd2acd67 100644
--- a/metadata/md5-cache/sys-auth/nss-mdns-0.13
+++ b/metadata/md5-cache/sys-auth/nss-mdns-0.13
@@ -7,7 +7,8 @@ IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 KEYWORDS=amd64 ~arm ~hppa ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=>=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lathiat/nss-mdns/releases/download/v0.13/nss-mdns-0.13.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=19f6ea41c36e0ac9f5458e651e9701a9
+_md5_=c81f8d025e777cdef3a7d9da0a05f91f
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10
index 3a5bb6e7e1f2..32a75183a9cf 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sasl? ( dev-libs/cyrus-sasl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] utils? ( python_targets_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(-)] ) pynslcd? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-daemon[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !sys-auth/nss_ldap !sys-auth/pam_ldap
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) pynslcd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3b6a60c70087e35049d1367548f844e9
+_md5_=e6960bf6e3aaaf803ffa6db5f70d7006
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11
index f53a40a23c88..53586a5d9e18 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sasl? ( dev-libs/cyrus-sasl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] utils? ( python_targets_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(-)] ) pynslcd? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-daemon[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !sys-auth/nss_ldap !sys-auth/pam_ldap
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) pynslcd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=29ee1973fff46b88c3a840bc900b14a6
+_md5_=39fa93ab05d4197427273864bb5442e0
diff --git a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.1 b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.1
index f9015136a31c..3d05aaab2b1f 100644
--- a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.1
+++ b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.1
@@ -7,7 +7,8 @@ IUSE=pam pskc test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=pam? ( sys-libs/pam ) pskc? ( dev-libs/xmlsec )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-2.6.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d849fc062548c911a3dafbe324a7a4b6
+_md5_=9559a44c743acc341b9098dec3ae9401
diff --git a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2 b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
index c8048df6338d..49fdd5360f38 100644
--- a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
+++ b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
@@ -7,7 +7,8 @@ IUSE=pam pskc test
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=pam? ( sys-libs/pam ) pskc? ( dev-libs/xmlsec )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-2.6.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ed3289e6a8ebca4155283bcfd1fc319b
+_md5_=077c8daa9193acdc9f971afc78432859
diff --git a/metadata/md5-cache/sys-auth/pam_yubico-2.26 b/metadata/md5-cache/sys-auth/pam_yubico-2.26
index b3abc2c7030f..4fe10e584f77 100644
--- a/metadata/md5-cache/sys-auth/pam_yubico-2.26
+++ b/metadata/md5-cache/sys-auth/pam_yubico-2.26
@@ -7,7 +7,8 @@ IUSE=ldap test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/pam sys-auth/libyubikey >=sys-auth/ykclient-2.15 >=sys-auth/ykpers-1.6 ldap? ( net-nds/openldap )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://opensource.yubico.com/yubico-pam/releases/pam_yubico-2.26.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=94f83625f0d935dbfdfcfa4f39be95e1
+_md5_=f8cd7920f584a3c31e492d878c4a8aff
diff --git a/metadata/md5-cache/sys-auth/polkit-0.115-r3 b/metadata/md5-cache/sys-auth/polkit-0.115-r3
index 8c2606049866..efab59a0f3c6 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.115-r3
+++ b/metadata/md5-cache/sys-auth/polkit-0.115-r3
@@ -9,7 +9,8 @@ LICENSE=LGPL-2
 PDEPEND=consolekit? ( sys-auth/consolekit[policykit] ) gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 >=lxde-base/lxsession-0.5.2 ) ) kde? ( kde-plasma/polkit-kde-agent )
 RDEPEND=dev-lang/spidermonkey:52[-debug] dev-libs/glib:2 dev-libs/expat elogind? ( sys-auth/elogind ) introspection? ( dev-libs/gobject-introspection ) pam? ( sys-auth/pambase sys-libs/pam ) systemd? ( sys-apps/systemd:0=[policykit] ) selinux? ( sec-policy/selinux-policykit )
 REQUIRED_USE=^^ ( consolekit elogind systemd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.115.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=591bb41d66ec7fb1caabbbb5b8c89dec
+_md5_=0ba3c04980f7924a773b7fba7b0b376a
diff --git a/metadata/md5-cache/sys-auth/polkit-0.115-r4 b/metadata/md5-cache/sys-auth/polkit-0.115-r4
index 86f3262d90d5..1e88bf713ed2 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.115-r4
+++ b/metadata/md5-cache/sys-auth/polkit-0.115-r4
@@ -10,7 +10,8 @@ LICENSE=LGPL-2
 PDEPEND=consolekit? ( sys-auth/consolekit[policykit] ) gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 >=lxde-base/lxsession-0.5.2 ) ) kde? ( kde-plasma/polkit-kde-agent )
 RDEPEND=dev-lang/spidermonkey:60[-debug] dev-libs/glib:2 dev-libs/expat elogind? ( sys-auth/elogind ) pam? ( sys-auth/pambase sys-libs/pam ) systemd? ( sys-apps/systemd:0=[policykit] ) selinux? ( sec-policy/selinux-policykit )
 REQUIRED_USE=^^ ( consolekit elogind systemd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.115.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1594d799fcee08dad7b18d80aa1ff0ca
+_md5_=3a492af454b29adaa1ffc473f6b2b9f6
diff --git a/metadata/md5-cache/sys-auth/polkit-0.116-r1 b/metadata/md5-cache/sys-auth/polkit-0.116-r1
index 99d883bc6746..4709b9a0de1e 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.116-r1
+++ b/metadata/md5-cache/sys-auth/polkit-0.116-r1
@@ -10,7 +10,8 @@ LICENSE=LGPL-2
 PDEPEND=consolekit? ( sys-auth/consolekit[policykit] ) gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 >=lxde-base/lxsession-0.5.2 ) ) kde? ( kde-plasma/polkit-kde-agent )
 RDEPEND=dev-lang/spidermonkey:60[-debug] dev-libs/glib:2 dev-libs/expat elogind? ( sys-auth/elogind ) pam? ( sys-auth/pambase sys-libs/pam ) systemd? ( sys-apps/systemd:0=[policykit] ) acct-user/polkitd selinux? ( sec-policy/selinux-policykit )
 REQUIRED_USE=^^ ( consolekit elogind systemd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.116.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba93e74f0d8ae930cab92442d50685b8
+_md5_=f0de58b31e0d4f78a2a80959856c039d
diff --git a/metadata/md5-cache/sys-auth/sssd-1.16.3-r3 b/metadata/md5-cache/sys-auth/sssd-1.16.3-r3
index a42deafcef16..e4740f06be82 100644
--- a/metadata/md5-cache/sys-auth/sssd-1.16.3-r3
+++ b/metadata/md5-cache/sys-auth/sssd-1.16.3-r3
@@ -8,7 +8,8 @@ IUSE=acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh tes
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5:= >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.5 ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-1.16.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8f8aab724e964c2e73181036d26cb6da
+_md5_=08a91cbc6291cbec25beef17f7620580
diff --git a/metadata/md5-cache/sys-auth/sssd-2.1.0-r1 b/metadata/md5-cache/sys-auth/sssd-2.1.0-r1
index 397a4a81a3ff..bb5eb72c0c2c 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.1.0-r1
+++ b/metadata/md5-cache/sys-auth/sssd-2.1.0-r1
@@ -8,7 +8,8 @@ IUSE=acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh tes
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5:= >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2[winbind] ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-2.1.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=843d582d16a0960b5392e49543db4fda
+_md5_=4ad7cb3bb2b635b580f8a4966c06e8d0
diff --git a/metadata/md5-cache/sys-auth/sssd-2.2.0-r1 b/metadata/md5-cache/sys-auth/sssd-2.2.0-r1
index c5300e8e3e85..d198b45ddb18 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.2.0-r1
+++ b/metadata/md5-cache/sys-auth/sssd-2.2.0-r1
@@ -8,7 +8,8 @@ IUSE=acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh tes
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5:= >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2[winbind] ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-2.2.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=843d582d16a0960b5392e49543db4fda
+_md5_=4ad7cb3bb2b635b580f8a4966c06e8d0
diff --git a/metadata/md5-cache/sys-auth/sssd-2.2.2 b/metadata/md5-cache/sys-auth/sssd-2.2.2
index 6815786d7422..6a5918903e67 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.2.2
+++ b/metadata/md5-cache/sys-auth/sssd-2.2.2
@@ -8,7 +8,8 @@ IUSE=acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh tes
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5:= >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2[winbind] ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-2.2.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=843d582d16a0960b5392e49543db4fda
+_md5_=4ad7cb3bb2b635b580f8a4966c06e8d0
diff --git a/metadata/md5-cache/sys-auth/sssd-2.2.3 b/metadata/md5-cache/sys-auth/sssd-2.2.3
index 56beac8854a4..50eedc78f68c 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.2.3
+++ b/metadata/md5-cache/sys-auth/sssd-2.2.3
@@ -8,7 +8,8 @@ IUSE=acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh tes
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] net-libs/http-parser >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 dev-libs/jansson net-misc/curl locator? ( >=app-crypt/mit-krb5-1.12.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/keyutils-1.5:= >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.10.2[winbind] ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/SSSD/sssd/sssd-2.2.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=843d582d16a0960b5392e49543db4fda
+_md5_=4ad7cb3bb2b635b580f8a4966c06e8d0
diff --git a/metadata/md5-cache/sys-auth/yubico-piv-tool-1.6.2 b/metadata/md5-cache/sys-auth/yubico-piv-tool-1.6.2
index 52d1b29dbeb9..4de1fb6e6873 100644
--- a/metadata/md5-cache/sys-auth/yubico-piv-tool-1.6.2
+++ b/metadata/md5-cache/sys-auth/yubico-piv-tool-1.6.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-libs/openssl:0=[-bindist] sys-apps/pcsc-lite
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-1.6.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f525f93b2a8ca8bcaf73386feb6305e5
+_md5_=8e934ffe70f53ce4e93c7f5cc47c453c
diff --git a/metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25 b/metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
index 864676c9c7fa..7499fe9406d1 100644
--- a/metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
+++ b/metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
@@ -7,7 +7,8 @@ IUSE=debug test
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/libyubikey-1.6 >=sys-auth/ykpers-1.14.0 virtual/libusb:1
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Yubico/yubikey-personalization-gui/archive/yubikey-personalization-gui-3.1.25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bfa73ac67ce7e931b2393dae119e6e97
+_md5_=400b83641d997084a1e99c5b23585b88
diff --git a/metadata/md5-cache/sys-block/mbuffer-20171011 b/metadata/md5-cache/sys-block/mbuffer-20171011
index 8a1bfd3f8372..617cfe521b64 100644
--- a/metadata/md5-cache/sys-block/mbuffer-20171011
+++ b/metadata/md5-cache/sys-block/mbuffer-20171011
@@ -7,6 +7,7 @@ IUSE=debug ssl test
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.maier-komor.de/software/mbuffer/mbuffer-20171011.tgz
-_md5_=278d561fe7ef5f7d45447c847ffd9c09
+_md5_=805c4c394fcc52f214330315543c9f53
diff --git a/metadata/md5-cache/sys-block/mbuffer-20181119 b/metadata/md5-cache/sys-block/mbuffer-20181119
index 6f79fc69640f..2400f3f0b7ac 100644
--- a/metadata/md5-cache/sys-block/mbuffer-20181119
+++ b/metadata/md5-cache/sys-block/mbuffer-20181119
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=test? ( ssl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.maier-komor.de/software/mbuffer/mbuffer-20181119.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=780bba49d508e6b7a5373194764ae217
+_md5_=51994a3f3672c6e86b48abf8df3c947a
diff --git a/metadata/md5-cache/sys-block/mbuffer-20190127 b/metadata/md5-cache/sys-block/mbuffer-20190127
index 6d00b34cdec0..02b80dd77b53 100644
--- a/metadata/md5-cache/sys-block/mbuffer-20190127
+++ b/metadata/md5-cache/sys-block/mbuffer-20190127
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=test? ( ssl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.maier-komor.de/software/mbuffer/mbuffer-20190127.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bb2570afb369308cfa8f261e8cffd614
+_md5_=67adeb7daf8628360a08ddc4be3c7ab1
diff --git a/metadata/md5-cache/sys-block/mbuffer-20190725 b/metadata/md5-cache/sys-block/mbuffer-20190725
index 424388d337f7..e7af0bda1323 100644
--- a/metadata/md5-cache/sys-block/mbuffer-20190725
+++ b/metadata/md5-cache/sys-block/mbuffer-20190725
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=test? ( ssl )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.maier-komor.de/software/mbuffer/mbuffer-20190725.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e52e6831b47cb77377614d2094232137
+_md5_=1b5b509e6fcc2e81cabe792b7ff31c74
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0
index 479819686900..91a8b1a1870a 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0
@@ -7,7 +7,8 @@ IUSE=static test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jthornber/thin-provisioning-tools/archive/v0.7.0.tar.gz -> thin-provisioning-tools-0.7.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f0230b51e32c6468f1a826de13fe088
+_md5_=45627a58e5b084a691664347714943fc
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.6 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.6
index ef140914c247..f5110c7c32e7 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.6
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.6
@@ -7,7 +7,8 @@ IUSE=static test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jthornber/thin-provisioning-tools/archive/v0.7.6.tar.gz -> thin-provisioning-tools-0.7.6.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=200dd148bd758d77de087ba86e0c49d7
+_md5_=bf3e087944aa7018cd5f96e0ec63c670
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.3 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.3
index d79b03154f3e..142deb0c92e9 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.3
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.3
@@ -8,7 +8,8 @@ IUSE=static test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.3.tar.gz -> thin-provisioning-tools-0.8.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9380353ba2ce43f9af9eeb3fc0e322a6
+_md5_=78783449f2278950d85f2f779add8b6b
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.5 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.5
index 567a00a0dded..9dda6c73f8b2 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.5
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.8.5
@@ -8,7 +8,8 @@ IUSE=static test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1001a7f3f50666d08222ccbdf75cf089
+_md5_=ac8bd35fb8f8ea91d08be302f2356dce
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-9999 b/metadata/md5-cache/sys-block/thin-provisioning-tools-9999
index 01315a8b6d51..543c8b78bc47 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-9999
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-9999
@@ -8,6 +8,7 @@ IUSE=static test
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9380353ba2ce43f9af9eeb3fc0e322a6
+_md5_=78783449f2278950d85f2f779add8b6b
diff --git a/metadata/md5-cache/sys-boot/mbr-1.1.11-r1 b/metadata/md5-cache/sys-boot/mbr-1.1.11-r1
index 145ef6705233..4314ec32c947 100644
--- a/metadata/md5-cache/sys-boot/mbr-1.1.11-r1
+++ b/metadata/md5-cache/sys-boot/mbr-1.1.11-r1
@@ -6,6 +6,7 @@ HOMEPAGE=https://www.chiark.greenend.org.uk/~neilt/mbr/
 IUSE=test
 KEYWORDS=-alpha amd64 -ppc -sparc x86
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.chiark.greenend.org.uk/~neilt/mbr/mbr-1.1.11.tar.gz
-_md5_=6f7e7e347fc9b58de01c1b4ab46e23bb
+_md5_=24c39967d8a3b442ac31032723137fb5
diff --git a/metadata/md5-cache/sys-cluster/cinder-13.0.7 b/metadata/md5-cache/sys-cluster/cinder-13.0.7
index b6b26e4abef0..d7a9e48f2e14 100644
--- a/metadata/md5-cache/sys-cluster/cinder-13.0.7
+++ b/metadata/md5-cache/sys-cluster/cinder-13.0.7
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/taskflow-2.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/simplejson-3.5.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-13.0.7 https://tarballs.openstack.org/cinder/cinder-13.0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de4a1043a5638e56a6c8ddd3d9078fa0
+_md5_=4225d92c94ec1eb5873b4f80bf2410dc
diff --git a/metadata/md5-cache/sys-cluster/cinder-14.0.1 b/metadata/md5-cache/sys-cluster/cinder-14.0.1
index 636c91ec9b5f..d11b321b1ea4 100644
--- a/metadata/md5-cache/sys-cluster/cinder-14.0.1
+++ b/metadata/md5-cache/sys-cluster/cinder-14.0.1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-6.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.44.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.34.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/requests-2.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-14.0.1 https://tarballs.openstack.org/cinder/cinder-14.0.1.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fdf7f9a6a6432d35ba14792e1da14136
+_md5_=9d4ce6a93f1065582d63a13c2683ccdf
diff --git a/metadata/md5-cache/sys-cluster/cinder-15.0.0 b/metadata/md5-cache/sys-cluster/cinder-15.0.0
index 9b956b86c25f..cb8e0ecfbac5 100644
--- a/metadata/md5-cache/sys-cluster/cinder-15.0.0
+++ b/metadata/md5-cache/sys-cluster/cinder-15.0.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/eventlet-0.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-6.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.44.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.34.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/requests-2.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-15.0.0 https://tarballs.openstack.org/cinder/cinder-15.0.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=cfda02b81cd3ec50cd8b8ba6b28bc760
+_md5_=49bca8539304a8b989e361c9557d3b43
diff --git a/metadata/md5-cache/sys-cluster/cinder-2018.2.9999 b/metadata/md5-cache/sys-cluster/cinder-2018.2.9999
index 8d0f0bfb7cfd..3b671d43f624 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2018.2.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2018.2.9999
@@ -8,7 +8,8 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/taskflow-2.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/simplejson-3.5.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-2018.2.9999
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1862148a7135201888c0b7222004d78
+_md5_=44afded64bb73e92773515175d0dbf8c
diff --git a/metadata/md5-cache/sys-cluster/cinder-2019.1.9999 b/metadata/md5-cache/sys-cluster/cinder-2019.1.9999
index 37fd9ebceb61..f8b7c0c07c95 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2019.1.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2019.1.9999
@@ -9,7 +9,8 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-6.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.44.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.34.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/requests-2.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-2019.1.9999
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ac26848b7ebd6beaad5a4ad127f7c949
+_md5_=d1d2ca17aa9530c2321cbf99d9d263d7
diff --git a/metadata/md5-cache/sys-cluster/cinder-2019.2.9999 b/metadata/md5-cache/sys-cluster/cinder-2019.2.9999
index b13c2fd12d87..d91c5f57e31e 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2019.2.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2019.2.9999
@@ -9,7 +9,8 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/eventlet-0.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-6.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.44.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.34.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/requests-2.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-2019.2.9999
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ff2e60ad04fff1bd3f0feaf6a1ec6bb2
+_md5_=5b21c239cf345f1d1284752083987f70
diff --git a/metadata/md5-cache/sys-cluster/gasnet-1.28.0 b/metadata/md5-cache/sys-cluster/gasnet-1.28.0
index bcf0e0f6785b..13d7aa62810d 100644
--- a/metadata/md5-cache/sys-cluster/gasnet-1.28.0
+++ b/metadata/md5-cache/sys-cluster/gasnet-1.28.0
@@ -7,7 +7,8 @@ IUSE=mpi test threads
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=mpi? ( virtual/mpi )
+RESTRICT=!test? ( test )
 SLOT=0/1.28.0
 SRC_URI=https://gasnet.lbl.gov/download/GASNet-1.28.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=75289b4e35309f774ab3443fe97c75f2
+_md5_=75259926b8ab97541ef03bd1724959b9
diff --git a/metadata/md5-cache/sys-cluster/gasnet-1.28.2 b/metadata/md5-cache/sys-cluster/gasnet-1.28.2
index f8a82e61f9a0..799d4ae04dfe 100644
--- a/metadata/md5-cache/sys-cluster/gasnet-1.28.2
+++ b/metadata/md5-cache/sys-cluster/gasnet-1.28.2
@@ -7,7 +7,8 @@ IUSE=mpi test threads
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=mpi? ( virtual/mpi )
+RESTRICT=!test? ( test )
 SLOT=0/1.28.2
 SRC_URI=https://gasnet.lbl.gov/download/GASNet-1.28.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d20106b75f5dc4ae633434b57fa96b16
+_md5_=dcac93893c99081d2cdca600bec3bdcd
diff --git a/metadata/md5-cache/sys-cluster/gasnet-1.30.0 b/metadata/md5-cache/sys-cluster/gasnet-1.30.0
index d5da705e76b0..82fe5d58525c 100644
--- a/metadata/md5-cache/sys-cluster/gasnet-1.30.0
+++ b/metadata/md5-cache/sys-cluster/gasnet-1.30.0
@@ -7,7 +7,8 @@ IUSE=mpi test threads
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 RDEPEND=mpi? ( virtual/mpi )
+RESTRICT=!test? ( test )
 SLOT=0/1.30.0
 SRC_URI=https://gasnet.lbl.gov/download/GASNet-1.30.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d20106b75f5dc4ae633434b57fa96b16
+_md5_=dcac93893c99081d2cdca600bec3bdcd
diff --git a/metadata/md5-cache/sys-cluster/hpx-0.9.99 b/metadata/md5-cache/sys-cluster/hpx-0.9.99
index 61cee024cade..6a40ef21009c 100644
--- a/metadata/md5-cache/sys-cluster/hpx-0.9.99
+++ b/metadata/md5-cache/sys-cluster/hpx-0.9.99
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=tbb? ( dev-cpp/tbb ) >=dev-libs/boost-1.49 papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib virtual/fortran
 REQUIRED_USE=jemalloc? ( !perftools !tbb ) perftools? ( !jemalloc !tbb ) tbb? ( !jemalloc !perftools )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://stellar.cct.lsu.edu/files/hpx_0.9.99.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7175569db3005eb51c7fa8b91f3e184b
+_md5_=690be6e7be94f29989c70984a9944937
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.0.0 b/metadata/md5-cache/sys-cluster/hpx-1.0.0
index c1c9ff3d6915..d47bb861be85 100644
--- a/metadata/md5-cache/sys-cluster/hpx-1.0.0
+++ b/metadata/md5-cache/sys-cluster/hpx-1.0.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=tbb? ( dev-cpp/tbb ) >=dev-libs/boost-1.49 papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib virtual/fortran
 REQUIRED_USE=jemalloc? ( !perftools !tbb ) perftools? ( !jemalloc !tbb ) tbb? ( !jemalloc !perftools )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://stellar.cct.lsu.edu/files/hpx_1.0.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2e901b46298ea079396299b4b2c4133
+_md5_=5f8e5674613a383ac6d241e3dce3ea71
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.1.0 b/metadata/md5-cache/sys-cluster/hpx-1.1.0
index 602e771be888..7807721bbb78 100644
--- a/metadata/md5-cache/sys-cluster/hpx-1.1.0
+++ b/metadata/md5-cache/sys-cluster/hpx-1.1.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=tbb? ( dev-cpp/tbb ) >=dev-libs/boost-1.49 papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib virtual/fortran
 REQUIRED_USE=jemalloc? ( !perftools !tbb ) perftools? ( !jemalloc !tbb ) tbb? ( !jemalloc !perftools )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://stellar.cct.lsu.edu/files/hpx_1.1.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6cff909ae14f007670246a224150b956
+_md5_=5f8e5674613a383ac6d241e3dce3ea71
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.2.0 b/metadata/md5-cache/sys-cluster/hpx-1.2.0
index a8dabff1572d..e828115ed792 100644
--- a/metadata/md5-cache/sys-cluster/hpx-1.2.0
+++ b/metadata/md5-cache/sys-cluster/hpx-1.2.0
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=tbb? ( dev-cpp/tbb ) >=dev-libs/boost-1.49 papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib virtual/fortran
 REQUIRED_USE=jemalloc? ( !perftools !tbb ) perftools? ( !jemalloc !tbb ) tbb? ( !jemalloc !perftools )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://stellar.cct.lsu.edu/files/hpx_1.2.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6cff909ae14f007670246a224150b956
+_md5_=5f8e5674613a383ac6d241e3dce3ea71
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.2.1 b/metadata/md5-cache/sys-cluster/hpx-1.2.1
index ba2fbff8ceb5..5d9df6767260 100644
--- a/metadata/md5-cache/sys-cluster/hpx-1.2.1
+++ b/metadata/md5-cache/sys-cluster/hpx-1.2.1
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=>=dev-libs/boost-1.49:= >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) tbb? ( dev-cpp/tbb ) virtual/fortran
 REQUIRED_USE=?? ( jemalloc perftools tbb )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://stellar.cct.lsu.edu/files/hpx_1.2.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=66472fd35721f88b1b4929f39232fea9
+_md5_=60abf8f1a5b3a5a7a86724d5f395391e
diff --git a/metadata/md5-cache/sys-cluster/hpx-9999 b/metadata/md5-cache/sys-cluster/hpx-9999
index 562ab24a9d40..157c758a7b00 100644
--- a/metadata/md5-cache/sys-cluster/hpx-9999
+++ b/metadata/md5-cache/sys-cluster/hpx-9999
@@ -9,6 +9,7 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=>=dev-libs/boost-1.49:= >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) tbb? ( dev-cpp/tbb ) virtual/fortran
 REQUIRED_USE=?? ( jemalloc perftools tbb )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=66472fd35721f88b1b4929f39232fea9
+_md5_=60abf8f1a5b3a5a7a86724d5f395391e
diff --git a/metadata/md5-cache/sys-cluster/legion-17.08.0 b/metadata/md5-cache/sys-cluster/legion-17.08.0
index e742e67e9c1d..6f85a58d1452 100644
--- a/metadata/md5-cache/sys-cluster/legion-17.08.0
+++ b/metadata/md5-cache/sys-cluster/legion-17.08.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://legion.stanford.edu/
 IUSE=gasnet +hwloc test
 KEYWORDS=~amd64
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-17.08.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5020176c3c32e14c2076397317901052
+_md5_=cdb4efe77c1d8f11f841722c6bd7db26
diff --git a/metadata/md5-cache/sys-cluster/legion-17.10.0 b/metadata/md5-cache/sys-cluster/legion-17.10.0
index 3ee944931a4a..602dd69f2c8e 100644
--- a/metadata/md5-cache/sys-cluster/legion-17.10.0
+++ b/metadata/md5-cache/sys-cluster/legion-17.10.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://legion.stanford.edu/
 IUSE=gasnet +hwloc test
 KEYWORDS=~amd64
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-17.10.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5020176c3c32e14c2076397317901052
+_md5_=cdb4efe77c1d8f11f841722c6bd7db26
diff --git a/metadata/md5-cache/sys-cluster/legion-18.02.0 b/metadata/md5-cache/sys-cluster/legion-18.02.0
index 4ced917d4f9c..59610670268e 100644
--- a/metadata/md5-cache/sys-cluster/legion-18.02.0
+++ b/metadata/md5-cache/sys-cluster/legion-18.02.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://legion.stanford.edu/
 IUSE=gasnet +hwloc test
 KEYWORDS=~amd64
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-18.02.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5020176c3c32e14c2076397317901052
+_md5_=cdb4efe77c1d8f11f841722c6bd7db26
diff --git a/metadata/md5-cache/sys-cluster/legion-18.05.0 b/metadata/md5-cache/sys-cluster/legion-18.05.0
index d62bdea5893f..8bef12dfb2e1 100644
--- a/metadata/md5-cache/sys-cluster/legion-18.05.0
+++ b/metadata/md5-cache/sys-cluster/legion-18.05.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://legion.stanford.edu/
 IUSE=gasnet +hwloc test
 KEYWORDS=~amd64
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-18.05.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67197fdfc8d68f7155b727c958a233a2
+_md5_=b6bc0cde17cdcbe4936747aab9b6340a
diff --git a/metadata/md5-cache/sys-cluster/legion-18.12.0 b/metadata/md5-cache/sys-cluster/legion-18.12.0
index 331ea40a874c..7608cfacd694 100644
--- a/metadata/md5-cache/sys-cluster/legion-18.12.0
+++ b/metadata/md5-cache/sys-cluster/legion-18.12.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://legion.stanford.edu/
 IUSE=gasnet +hwloc test
 KEYWORDS=~amd64
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-18.12.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67197fdfc8d68f7155b727c958a233a2
+_md5_=b6bc0cde17cdcbe4936747aab9b6340a
diff --git a/metadata/md5-cache/sys-cluster/legion-19.06.0 b/metadata/md5-cache/sys-cluster/legion-19.06.0
index 81e22739169b..80be1f29b93e 100644
--- a/metadata/md5-cache/sys-cluster/legion-19.06.0
+++ b/metadata/md5-cache/sys-cluster/legion-19.06.0
@@ -6,7 +6,8 @@ HOMEPAGE=https://legion.stanford.edu/
 IUSE=gasnet +hwloc test
 KEYWORDS=~amd64
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-19.06.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67197fdfc8d68f7155b727c958a233a2
+_md5_=b6bc0cde17cdcbe4936747aab9b6340a
diff --git a/metadata/md5-cache/sys-cluster/legion-9999 b/metadata/md5-cache/sys-cluster/legion-9999
index 3aa16140ce10..740bbce5fd9c 100644
--- a/metadata/md5-cache/sys-cluster/legion-9999
+++ b/metadata/md5-cache/sys-cluster/legion-9999
@@ -6,6 +6,7 @@ HOMEPAGE=https://legion.stanford.edu/
 IUSE=gasnet +hwloc test
 LICENSE=BSD
 PROPERTIES=live
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67197fdfc8d68f7155b727c958a233a2
+_md5_=b6bc0cde17cdcbe4936747aab9b6340a
diff --git a/metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1 b/metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1
index b09e0fd99ed5..fa81390b0812 100644
--- a/metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1
+++ b/metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=virtual/mpi
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hpc/libcircle/archive/0.2.0-rc.1.tar.gz -> libcircle-0.2.0_rc1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=2f6f486b50408f5872240e7827a6b233
+_md5_=e4c06dbcc2bc854256ad3b750e897030
diff --git a/metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1 b/metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1
index 79043537c414..03f4feeff353 100644
--- a/metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1
+++ b/metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=virtual/mpi
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hpc/libcircle/archive/0.2.1-rc.1.tar.gz -> libcircle-0.2.1_rc1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=2f6f486b50408f5872240e7827a6b233
+_md5_=e4c06dbcc2bc854256ad3b750e897030
diff --git a/metadata/md5-cache/sys-cluster/libqb-0.17.1 b/metadata/md5-cache/sys-cluster/libqb-0.17.1
index a65c4ce7d372..365ba363c405 100644
--- a/metadata/md5-cache/sys-cluster/libqb-0.17.1
+++ b/metadata/md5-cache/sys-cluster/libqb-0.17.1
@@ -7,7 +7,8 @@ IUSE=debug doc examples static-libs test
 KEYWORDS=amd64 hppa x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/q/u/quarterback/libqb-0.17.1.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=32a6f6e444e4a487cc7a7b3cdda2d27a
+_md5_=49704320f141b2ab984d68b9a066a609
diff --git a/metadata/md5-cache/sys-cluster/libqb-0.17.2 b/metadata/md5-cache/sys-cluster/libqb-0.17.2
index 8b62afb74746..2aa5ef0594f9 100644
--- a/metadata/md5-cache/sys-cluster/libqb-0.17.2
+++ b/metadata/md5-cache/sys-cluster/libqb-0.17.2
@@ -7,7 +7,8 @@ IUSE=debug doc examples static-libs test
 KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/q/u/quarterback/libqb-0.17.2.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd7deea7532e187953278271a7624056
+_md5_=78f5e191216c16f16395f3ea666f8f12
diff --git a/metadata/md5-cache/sys-cluster/libqb-1.0.1 b/metadata/md5-cache/sys-cluster/libqb-1.0.1
index 51f7096640d0..c975a976c412 100644
--- a/metadata/md5-cache/sys-cluster/libqb-1.0.1
+++ b/metadata/md5-cache/sys-cluster/libqb-1.0.1
@@ -7,7 +7,8 @@ IUSE=debug doc examples static-libs test
 KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/libqb/releases/download/v1.0.1/libqb-1.0.1.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2a962fe8889451713bca52aca23c4984
+_md5_=b1b1f5201abc3583737ed2afb3526572
diff --git a/metadata/md5-cache/sys-cluster/libquo-1.2.9 b/metadata/md5-cache/sys-cluster/libquo-1.2.9
index 7fbe19854c75..b8493b7baf65 100644
--- a/metadata/md5-cache/sys-cluster/libquo-1.2.9
+++ b/metadata/md5-cache/sys-cluster/libquo-1.2.9
@@ -7,7 +7,8 @@ IUSE=fortran static-libs test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://lanl.github.io/libquo/dists/libquo-1.2.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e1291d29dfaf7cba59286661f0b18396
+_md5_=4eb79f26e262b84ca013dcbfc9abbdf3
diff --git a/metadata/md5-cache/sys-cluster/libquo-9999 b/metadata/md5-cache/sys-cluster/libquo-9999
index 35f20c9a906e..c50affb0afc7 100644
--- a/metadata/md5-cache/sys-cluster/libquo-9999
+++ b/metadata/md5-cache/sys-cluster/libquo-9999
@@ -7,6 +7,7 @@ IUSE=fortran static-libs test
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	f75a2d9321053acf424991e805f32ede	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee31f52a7e721cf8f19b912a7970dcd9
+_md5_=049d05d34bbcd7ce010a95531fae484d
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-4.3-r2 b/metadata/md5-cache/sys-devel/binutils-apple-4.3-r2
index 9708283976b6..539944c732f3 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-4.3-r2
+++ b/metadata/md5-cache/sys-devel/binutils-apple-4.3-r2
@@ -7,7 +7,8 @@ IUSE=lto test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm:* )
+RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-128.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-822.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-855.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-30.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-195.6.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14f10b251f81a53d09e17ce148f3639f
+_md5_=0bbe136d57ecfc9cdcb5cc48e8839f8f
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-5.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-5.1-r1
index 1a23c8fdeabe..5fe09d56eb3b 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-5.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-5.1-r1
@@ -7,7 +7,8 @@ IUSE=lto test libcxx multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm:* ) libcxx? ( sys-libs/libcxx )
+RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-236.3.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-855.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-353.2.1.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e00d41d535dabd989ee77659109456e
+_md5_=d63f83f053b4fa02762b12a4ed3ad9b7
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-6.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-6.1-r1
index c9ff97c665ca..8631a015cebf 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-6.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-6.1-r1
@@ -7,7 +7,8 @@ IUSE=lto test libcxx multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm:* ) libcxx? ( sys-libs/libcxx )
+RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-241.9.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-862.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-353.2.1.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7088ec6199459156f61bbdb11158a45a
+_md5_=39a3cb9b1c3bc614a503523a191ea85f
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-6.3-r2 b/metadata/md5-cache/sys-devel/binutils-apple-6.3-r2
index 820649c08e94..7194349566d4 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-6.3-r2
+++ b/metadata/md5-cache/sys-devel/binutils-apple-6.3-r2
@@ -7,7 +7,8 @@ IUSE=lto test libcxx multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm:* ) libcxx? ( sys-libs/libcxx )
+RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-242.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-870.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-353.2.1.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a677218ba57e5eb0ef00e2c8c5cb4201
+_md5_=6c3d7fa99e291baeeaa06496d66cbdfa
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.0-r1 b/metadata/md5-cache/sys-devel/binutils-apple-7.0-r1
index dc76ef93b870..f5bbf6fbc8bd 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.0-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.0-r1
@@ -7,7 +7,8 @@ IUSE=lto test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx
+RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.3.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.5.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.14.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=375c9f1729e988e0375c74a5f8dd9ff8
+_md5_=37b9a787bd55b2c80dbac3b084f26bb6
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-7.1-r1
index 327339ec0c61..c62ec0467d4c 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.1-r1
@@ -7,7 +7,8 @@ IUSE=lto test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx
+RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.6.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.7.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.17.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=31fc315bbd4b94950b557ff9ee187e7d
+_md5_=ab41d095af7668db18bc9794accd4afb
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.2-r1 b/metadata/md5-cache/sys-devel/binutils-apple-7.2-r1
index e23f1a94f037..f5a6002d0320 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.2-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.2-r1
@@ -7,7 +7,8 @@ IUSE=lto test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx
+RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.9.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.8.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.18.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r3.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.2-r1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2f376eae20c8104edcb23da4659037e0
+_md5_=3a2372cdf927891a314878190837daa8
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.3.1 b/metadata/md5-cache/sys-devel/binutils-apple-7.3.1
index b391c675ccf8..8c8a921f6441 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.3.1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.3.1
@@ -7,7 +7,8 @@ IUSE=lto test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx
+RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-264.3.102.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-886.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.18.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r3.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.2-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=25cd1c00d8b2383fe6500c8677299720
+_md5_=e35093805eca08848dfd8a26b08d641a
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-8.1 b/metadata/md5-cache/sys-devel/binutils-apple-8.1
index bd8f6af6bede..f7eac5925ef5 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-8.1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-8.1
@@ -7,7 +7,8 @@ IUSE=lto tapi classic test
 KEYWORDS=~x64-macos ~x86-macos
 LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm:* sys-libs/libcxx
+RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-274.1.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-895.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-421.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r3.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-8.2-r1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5dc5afcf4ef2a171ed6e01de66260574
+_md5_=f44abd885a5718101742d5438585f88c
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
index ca954f7597bf..012b93c36421 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
@@ -7,7 +7,8 @@ IUSE=lto tapi classic test
 KEYWORDS=~x64-macos ~x86-macos
 LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm:* sys-libs/libcxx
+RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-274.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-895.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-421.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-8.2-r1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6cd18e7df6ab5e2b3dbde2d2bde4e8bb
+_md5_=bd165a07fe39e22aa5e482c6389231eb
diff --git a/metadata/md5-cache/sys-devel/bison-3.1 b/metadata/md5-cache/sys-devel/bison-3.1
index 30bc6dea2734..8506040d3a59 100644
--- a/metadata/md5-cache/sys-devel/bison-3.1
+++ b/metadata/md5-cache/sys-devel/bison-3.1
@@ -7,7 +7,8 @@ IUSE=examples nls static test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.1.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.1-patches-1.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a28873c25dfc3beadce260910cec71ef
+_md5_=702a1a8ec0f65bc931f6a47544b1ac96
diff --git a/metadata/md5-cache/sys-devel/bison-3.2.4 b/metadata/md5-cache/sys-devel/bison-3.2.4
index 24c31735636d..6875108f54ce 100644
--- a/metadata/md5-cache/sys-devel/bison-3.2.4
+++ b/metadata/md5-cache/sys-devel/bison-3.2.4
@@ -7,7 +7,8 @@ IUSE=examples nls static test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.2.4.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.2.3-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.2.3-patches-01.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=00f99447c444460953fff395f7ade671
+_md5_=a54b2eeb040ddcda1530d2a9708c2ef4
diff --git a/metadata/md5-cache/sys-devel/bison-3.3.2 b/metadata/md5-cache/sys-devel/bison-3.3.2
index 05f4852698ea..977472852e16 100644
--- a/metadata/md5-cache/sys-devel/bison-3.3.2
+++ b/metadata/md5-cache/sys-devel/bison-3.3.2
@@ -7,7 +7,8 @@ IUSE=examples nls static test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.3.2.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.3-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.3-patches-01.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b67aee8860ea9e4ed5d03bfb3f002958
+_md5_=b5af4590ff851a9fa4efbb5131c84e09
diff --git a/metadata/md5-cache/sys-devel/bison-3.4.1 b/metadata/md5-cache/sys-devel/bison-3.4.1
index 44f01c2a3366..c8ea70e17109 100644
--- a/metadata/md5-cache/sys-devel/bison-3.4.1
+++ b/metadata/md5-cache/sys-devel/bison-3.4.1
@@ -7,7 +7,8 @@ IUSE=examples nls static test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.4.1.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.4.1-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.4.1-patches-01.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=66a4ef7a005aca7f33b55238089b7325
+_md5_=8045d94ad98b99e2912d96c0b1a6b89e
diff --git a/metadata/md5-cache/sys-devel/bison-3.4.2 b/metadata/md5-cache/sys-devel/bison-3.4.2
index 10782e71f030..c926e2da66db 100644
--- a/metadata/md5-cache/sys-devel/bison-3.4.2
+++ b/metadata/md5-cache/sys-devel/bison-3.4.2
@@ -7,7 +7,8 @@ IUSE=examples nls static test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.4.2.tar.xz mirror://gentoo/bison-3.4.2-patches-01.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.4.2-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.4.2-patches-01.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e0e6b378ba2b6312c2284397f750f294
+_md5_=96ad1e9d8c7127589a356ae9b6d9e54d
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.1 b/metadata/md5-cache/sys-devel/flex-2.6.1
index 5e0449766013..941685df4780 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.1
+++ b/metadata/md5-cache/sys-devel/flex-2.6.1
@@ -7,7 +7,8 @@ IUSE=nls static test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=FLEX
 RDEPEND=sys-devel/m4
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1eb4697d50eb5cb4b71b42d2bb370136
+_md5_=9c8984e5b2b5c921463bce916bcc8fd6
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.3 b/metadata/md5-cache/sys-devel/flex-2.6.3
index 50cbf0ea24f5..de07283d0ad9 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.3
+++ b/metadata/md5-cache/sys-devel/flex-2.6.3
@@ -7,7 +7,8 @@ IUSE=nls static test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=FLEX
 RDEPEND=sys-devel/m4
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.3/flex-2.6.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f557f32ee91ba752fc51e11e474ff2cb
+_md5_=8bdd1278c21b3d6fdd910db038913600
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.3-r1 b/metadata/md5-cache/sys-devel/flex-2.6.3-r1
index 84497184ee35..9801f2cc05fb 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.3-r1
+++ b/metadata/md5-cache/sys-devel/flex-2.6.3-r1
@@ -7,7 +7,8 @@ IUSE=nls static test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=FLEX
 RDEPEND=sys-devel/m4
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.3/flex-2.6.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db298cf173e4f58b6d1c3b9cf8bc0d68
+_md5_=fe1cc564cd62251adc01029a031b7c8b
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.4 b/metadata/md5-cache/sys-devel/flex-2.6.4
index 93b23da0a230..abd51557f39e 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.4
+++ b/metadata/md5-cache/sys-devel/flex-2.6.4
@@ -7,7 +7,8 @@ IUSE=nls static test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=FLEX
 RDEPEND=sys-devel/m4
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a90c48f91feb7d3d47417665d495542d
+_md5_=9e2067ee69505bb30149fea64e578744
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.4-r1 b/metadata/md5-cache/sys-devel/flex-2.6.4-r1
index 688b8f2f794e..5b394bb98785 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.4-r1
+++ b/metadata/md5-cache/sys-devel/flex-2.6.4-r1
@@ -7,7 +7,8 @@ IUSE=nls static test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=FLEX
 RDEPEND=sys-devel/m4
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ce5c5b049b1c515f02d29e6b4135574
+_md5_=b96133be88c7d9256a98251ae1960413
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6-r4 b/metadata/md5-cache/sys-devel/patch-2.7.6-r4
index 6158d4ec777a..79769863adbc 100644
--- a/metadata/md5-cache/sys-devel/patch-2.7.6-r4
+++ b/metadata/md5-cache/sys-devel/patch-2.7.6-r4
@@ -7,7 +7,8 @@ IUSE=static test xattr
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=xattr? ( sys-apps/attr )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5222a26258d092682d2c3ada6e3dfec3
+_md5_=cf62e8aeb8c30771d43dd2fb27067bcd
diff --git a/metadata/md5-cache/sys-devel/sparse-0.5.1 b/metadata/md5-cache/sys-devel/sparse-0.5.1
index 60092885c1a6..edde16e18e52 100644
--- a/metadata/md5-cache/sys-devel/sparse-0.5.1
+++ b/metadata/md5-cache/sys-devel/sparse-0.5.1
@@ -7,7 +7,8 @@ IUSE=gtk llvm test xml
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/devel/sparse/dist/sparse-0.5.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2c7ef08a9ae09304b5d3392c60cd393
+_md5_=04f11b0c6e9f1f42c1c6271ba02927e0
diff --git a/metadata/md5-cache/sys-devel/sparse-0.5.2_rc1 b/metadata/md5-cache/sys-devel/sparse-0.5.2_rc1
index 6a6b50a86a05..c2d67aa80a2c 100644
--- a/metadata/md5-cache/sys-devel/sparse-0.5.2_rc1
+++ b/metadata/md5-cache/sys-devel/sparse-0.5.2_rc1
@@ -7,7 +7,8 @@ IUSE=gtk llvm test xml
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/devel/sparse/sparse.git/snapshot/sparse-d1c2f8d3d4205ca1ae7cf0ec2cbd89a7fce73e5c.tar.gz -> sparse-0.5.2-rc1.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_=d0a8feb35ea6b0f6c966e5e7700d864c
+_md5_=584b516a7e75fc2504c010a2e8da3e6c
diff --git a/metadata/md5-cache/sys-devel/sparse-0.6.0 b/metadata/md5-cache/sys-devel/sparse-0.6.0
index 1ecb105b6ae0..920f8241fd20 100644
--- a/metadata/md5-cache/sys-devel/sparse-0.6.0
+++ b/metadata/md5-cache/sys-devel/sparse-0.6.0
@@ -7,7 +7,8 @@ IUSE=gtk llvm test xml
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/devel/sparse/dist/sparse-0.6.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=094290b31e0b8a9bcda0b0cdd110e6bc
+_md5_=184f360f5a55a91bf36613fbdc14dea8
diff --git a/metadata/md5-cache/sys-devel/sparse-9999 b/metadata/md5-cache/sys-devel/sparse-9999
index 50c58dd98f79..fe6602d44558 100644
--- a/metadata/md5-cache/sys-devel/sparse-9999
+++ b/metadata/md5-cache/sys-devel/sparse-9999
@@ -8,6 +8,7 @@ IUSE=gtk llvm test xml
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=094290b31e0b8a9bcda0b0cdd110e6bc
+_md5_=184f360f5a55a91bf36613fbdc14dea8
diff --git a/metadata/md5-cache/sys-fs/cryfs-0.10.2 b/metadata/md5-cache/sys-fs/cryfs-0.10.2
index 35ccf678d2e5..0a7fba2a4735 100644
--- a/metadata/md5-cache/sys-fs/cryfs-0.10.2
+++ b/metadata/md5-cache/sys-fs/cryfs-0.10.2
@@ -8,7 +8,8 @@ IUSE=custom-optimization debug libressl test kernel_linux
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-3 MIT
 RDEPEND=>=dev-libs/boost-1.65.1:= >=dev-libs/crypto++-8.2.0:= net-misc/curl:= >=sys-fs/fuse-2.8.6:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cryfs/cryfs/releases/download/0.10.2/cryfs-0.10.2.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=af9d4b0c265203371894fe230b3d7532
+_md5_=e8f588a231bb6a016998e3061918d0dc
diff --git a/metadata/md5-cache/sys-fs/cryfs-0.9.9-r1 b/metadata/md5-cache/sys-fs/cryfs-0.9.9-r1
index fcfa31128638..fb2e52fab040 100644
--- a/metadata/md5-cache/sys-fs/cryfs-0.9.9-r1
+++ b/metadata/md5-cache/sys-fs/cryfs-0.9.9-r1
@@ -7,7 +7,8 @@ IUSE=custom-optimization libressl test update-check
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-3 BSD-2 MIT
 RDEPEND=>=dev-libs/boost-1.56:= >=dev-libs/crypto++-5.6.3:= net-misc/curl:= >=sys-fs/fuse-2.8.6:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cryfs/cryfs/releases/download/0.9.9/cryfs-0.9.9.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e56d1ba34ba39094862d01352393b356
+_md5_=9be9a1dcbe87cd4745e2afd59ab5bc8f
diff --git a/metadata/md5-cache/sys-fs/cryfs-9999 b/metadata/md5-cache/sys-fs/cryfs-9999
index 09443174c424..a9b152530215 100644
--- a/metadata/md5-cache/sys-fs/cryfs-9999
+++ b/metadata/md5-cache/sys-fs/cryfs-9999
@@ -8,6 +8,7 @@ IUSE=custom-optimization debug libressl test kernel_linux
 LICENSE=LGPL-3 MIT Boost-1.0
 PROPERTIES=live
 RDEPEND=>=dev-libs/boost-1.65.1:= net-misc/curl:= >=sys-fs/fuse-2.8.6:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2564613539ab8a37dd042b03480f171
+_md5_=5c62dd0f56092124f188e98841838c17
diff --git a/metadata/md5-cache/sys-fs/dosfstools-4.1 b/metadata/md5-cache/sys-fs/dosfstools-4.1
index 7f94fcd45df4..15a70f07596c 100644
--- a/metadata/md5-cache/sys-fs/dosfstools-4.1
+++ b/metadata/md5-cache/sys-fs/dosfstools-4.1
@@ -7,7 +7,8 @@ IUSE=compat test +udev
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=udev? ( virtual/libudev )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dosfstools/dosfstools/releases/download/v4.1/dosfstools-4.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1be565fab61ac6b35ba4294b0a26fe39
+_md5_=54508787dfe22b8cdf42941e298f6ee7
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.5 b/metadata/md5-cache/sys-fs/eudev-3.2.5
index ae551925ff1f..a148d2b82ccd 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.5
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.5
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=199a5e2083b6d078adcb27e673f56801
+_md5_=efbca0562bd9b4919a129522772cfec3
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.7-r2 b/metadata/md5-cache/sys-fs/eudev-3.2.7-r2
index 83babb5b0e7e..5f39da3420e3 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.7-r2
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.7-r2
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.7.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1c2ca82eb4c3cd50778fe24bfd2b3444
+_md5_=db7aa53d3750080078b4e58e9a4e3936
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.8 b/metadata/md5-cache/sys-fs/eudev-3.2.8
index e3b8bfc1af88..ca9d1951d6dd 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.8
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.8
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1c2ca82eb4c3cd50778fe24bfd2b3444
+_md5_=db7aa53d3750080078b4e58e9a4e3936
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.9 b/metadata/md5-cache/sys-fs/eudev-3.2.9
index 87d635721d0a..ca672de26a30 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.9
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.9
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sp
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.9.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=11529103cd7cc4de87b525a90277f506
+_md5_=b9b44600671061f4688bc6cdef310271
diff --git a/metadata/md5-cache/sys-fs/eudev-4.9999 b/metadata/md5-cache/sys-fs/eudev-4.9999
index 285f85c9bb00..882922b77e26 100644
--- a/metadata/md5-cache/sys-fs/eudev-4.9999
+++ b/metadata/md5-cache/sys-fs/eudev-4.9999
@@ -8,6 +8,7 @@ LICENSE=LGPL-2.1 GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.20 kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e3d51b3f98ef8dbdb8b7f70f8ab8c866
+_md5_=f4334e23970a455fbba6560aaf47aeb7
diff --git a/metadata/md5-cache/sys-fs/eudev-9999 b/metadata/md5-cache/sys-fs/eudev-9999
index f02a74d6be78..39d6865995e5 100644
--- a/metadata/md5-cache/sys-fs/eudev-9999
+++ b/metadata/md5-cache/sys-fs/eudev-9999
@@ -8,6 +8,7 @@ LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.20 introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1c2ca82eb4c3cd50778fe24bfd2b3444
+_md5_=db7aa53d3750080078b4e58e9a4e3936
diff --git a/metadata/md5-cache/sys-fs/safecopy-1.7 b/metadata/md5-cache/sys-fs/safecopy-1.7
index 23f9222287d4..8a6981ce737f 100644
--- a/metadata/md5-cache/sys-fs/safecopy-1.7
+++ b/metadata/md5-cache/sys-fs/safecopy-1.7
@@ -5,7 +5,8 @@ HOMEPAGE=http://safecopy.sourceforge.net
 IUSE=test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/safecopy/safecopy-1.7.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_=98dbb8cc5422bc79b4607cba251d5b2e
+_md5_=909b0e552bf9dc433b50913f7952f644
diff --git a/metadata/md5-cache/sys-fs/snapraid-10.0 b/metadata/md5-cache/sys-fs/snapraid-10.0
index cdfb541cd88d..567c30de88aa 100644
--- a/metadata/md5-cache/sys-fs/snapraid-10.0
+++ b/metadata/md5-cache/sys-fs/snapraid-10.0
@@ -5,6 +5,7 @@ HOMEPAGE=http://snapraid.sourceforge.net/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/amadvance/snapraid/releases/download/v10.0/snapraid-10.0.tar.gz
-_md5_=d2cbedbf643e49476eafc901e6637ceb
+_md5_=539fd2d8e956cee4aa3832dd0df12acb
diff --git a/metadata/md5-cache/sys-fs/snapraid-11.0-r1 b/metadata/md5-cache/sys-fs/snapraid-11.0-r1
index 1d6c1c4babe0..581c78fb13f8 100644
--- a/metadata/md5-cache/sys-fs/snapraid-11.0-r1
+++ b/metadata/md5-cache/sys-fs/snapraid-11.0-r1
@@ -6,7 +6,8 @@ HOMEPAGE=http://snapraid.sourceforge.net/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/amadvance/snapraid/releases/download/v11.0/snapraid-11.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d5826eb3481ef108fdde04bfeeb086dd
+_md5_=8947f96c155db9a7fbef454e4995ff61
diff --git a/metadata/md5-cache/sys-fs/snapraid-11.2 b/metadata/md5-cache/sys-fs/snapraid-11.2
index 9fc996afda59..13ac3de5cf37 100644
--- a/metadata/md5-cache/sys-fs/snapraid-11.2
+++ b/metadata/md5-cache/sys-fs/snapraid-11.2
@@ -6,7 +6,8 @@ HOMEPAGE=http://snapraid.it/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/amadvance/snapraid/releases/download/v11.2/snapraid-11.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d290c6b8cc0ff6c853835216044a8995
+_md5_=155fd9d3f1be2b7cc2da8552e50cef54
diff --git a/metadata/md5-cache/sys-fs/snapraid-6.2 b/metadata/md5-cache/sys-fs/snapraid-6.2
index c411ba40fa80..a127e9edab9e 100644
--- a/metadata/md5-cache/sys-fs/snapraid-6.2
+++ b/metadata/md5-cache/sys-fs/snapraid-6.2
@@ -6,7 +6,8 @@ HOMEPAGE=http://snapraid.sourceforge.net/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/snapraid/snapraid-6.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=631be7d7d6cb97a67faa9df1f0ddfe6b
+_md5_=b18b8c67ad81e67a5a13d4b4a9c4ad13
diff --git a/metadata/md5-cache/sys-fs/snapraid-6.3 b/metadata/md5-cache/sys-fs/snapraid-6.3
index 4685b311da7f..e5f02bc5c75e 100644
--- a/metadata/md5-cache/sys-fs/snapraid-6.3
+++ b/metadata/md5-cache/sys-fs/snapraid-6.3
@@ -6,7 +6,8 @@ HOMEPAGE=http://snapraid.sourceforge.net/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/snapraid/snapraid-6.3.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=631be7d7d6cb97a67faa9df1f0ddfe6b
+_md5_=b18b8c67ad81e67a5a13d4b4a9c4ad13
diff --git a/metadata/md5-cache/sys-fs/snapraid-7.0 b/metadata/md5-cache/sys-fs/snapraid-7.0
index 557609c3a350..a3ef489772d3 100644
--- a/metadata/md5-cache/sys-fs/snapraid-7.0
+++ b/metadata/md5-cache/sys-fs/snapraid-7.0
@@ -6,7 +6,8 @@ HOMEPAGE=http://snapraid.sourceforge.net/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/snapraid/snapraid-7.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=20daacd899cd9ef947097ef6a4aa01b8
+_md5_=98566a93bb8f016b0be331a2df7cde4b
diff --git a/metadata/md5-cache/sys-fs/snapraid-7.1 b/metadata/md5-cache/sys-fs/snapraid-7.1
index 2e3932b2c0f3..f708527a2c07 100644
--- a/metadata/md5-cache/sys-fs/snapraid-7.1
+++ b/metadata/md5-cache/sys-fs/snapraid-7.1
@@ -6,7 +6,8 @@ HOMEPAGE=http://snapraid.sourceforge.net/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/snapraid/snapraid-7.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24cb6da523dd2fad44362e3c729fc738
+_md5_=71b933c1b082888f6ec9a3176c2b05d8
diff --git a/metadata/md5-cache/sys-fs/snapraid-8.1 b/metadata/md5-cache/sys-fs/snapraid-8.1
index a4a2222ea0b9..b197b9c48931 100644
--- a/metadata/md5-cache/sys-fs/snapraid-8.1
+++ b/metadata/md5-cache/sys-fs/snapraid-8.1
@@ -6,7 +6,8 @@ HOMEPAGE=http://snapraid.sourceforge.net/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/snapraid/snapraid-8.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24cb6da523dd2fad44362e3c729fc738
+_md5_=71b933c1b082888f6ec9a3176c2b05d8
diff --git a/metadata/md5-cache/sys-fs/tmsu-0.6.1 b/metadata/md5-cache/sys-fs/tmsu-0.6.1
index d5cb2843286a..9af4a4bfb41d 100644
--- a/metadata/md5-cache/sys-fs/tmsu-0.6.1
+++ b/metadata/md5-cache/sys-fs/tmsu-0.6.1
@@ -7,8 +7,8 @@ IUSE=test zsh-completion
 KEYWORDS=~amd64
 LICENSE=GPL-3+
 RDEPEND=zsh-completion? ( app-shells/zsh )
-RESTRICT=strip
+RESTRICT=strip !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oniony/TMSU/archive/v0.6.1.tar.gz -> tmsu-0.6.1.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7
-_md5_=3ca20d7277f52566bb2eea2cf1fc89d3
+_md5_=11719b710f0697889aca6bb854f0bdaa
diff --git a/metadata/md5-cache/sys-fs/tmsu-0.7.0 b/metadata/md5-cache/sys-fs/tmsu-0.7.0
index 3c2445dbb9ff..fe43b32d7a58 100644
--- a/metadata/md5-cache/sys-fs/tmsu-0.7.0
+++ b/metadata/md5-cache/sys-fs/tmsu-0.7.0
@@ -7,8 +7,8 @@ IUSE=test zsh-completion
 KEYWORDS=~amd64
 LICENSE=GPL-3+
 RDEPEND=zsh-completion? ( app-shells/zsh )
-RESTRICT=strip
+RESTRICT=strip !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oniony/TMSU/archive/v0.7.0.tar.gz -> tmsu-0.7.0.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7
-_md5_=3ca20d7277f52566bb2eea2cf1fc89d3
+_md5_=11719b710f0697889aca6bb854f0bdaa
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.6.3 b/metadata/md5-cache/sys-kernel/kpatch-0.6.3
index 670a012faf0d..3a21507be6d8 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.6.3
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.6.3
@@ -7,7 +7,8 @@ IUSE=+kpatch-build +kpatch kmod doc contrib test kernel_linux kernel_linux
 KEYWORDS=~amd64
 LICENSE=GPL-2+
 RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.6.3.tar.gz -> kpatch-0.6.3.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a53b66a6c4e36e00a9d46cc9270c576b
+_md5_=665cb343a76ec6bb6fa0bf1f243c7bd8
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.7.1 b/metadata/md5-cache/sys-kernel/kpatch-0.7.1
index 2acdcd959994..1b6c731b4230 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.7.1
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.7.1
@@ -7,7 +7,8 @@ IUSE=contrib +kpatch +kpatch-build kmod test kernel_linux kernel_linux
 KEYWORDS=~amd64
 LICENSE=GPL-2+
 RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.7.1.tar.gz -> kpatch-0.7.1.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=48fbc234993deb5bfa658ef5e3454e2e
+_md5_=6001286ed710bbca90db3159c0a35a70
diff --git a/metadata/md5-cache/sys-kernel/kpatch-9999 b/metadata/md5-cache/sys-kernel/kpatch-9999
index fce5135f896f..6f71606a9214 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-9999
+++ b/metadata/md5-cache/sys-kernel/kpatch-9999
@@ -8,6 +8,7 @@ IUSE=contrib +kpatch +kpatch-build kmod test kernel_linux kernel_linux
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=43ff3a50e41fe766007aea0aeaf8b95b
+_md5_=a25433b28f077894415b8b4d5562f956
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.20-r2 b/metadata/md5-cache/sys-libs/libblockdev-2.20-r2
index 19953bce0652..30f08cbe9795 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.20-r2
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.20-r2
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) escrow? ( cryptsetup )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/archive/2.20-1.tar.gz -> libblockdev-2.20-1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97412b19a427f810f48c89aa045a1f5f
+_md5_=b54dbfb42548223278232aac41444156
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.22 b/metadata/md5-cache/sys-libs/libblockdev-2.22
index 9c84da5f8931..e5e0ec80ff73 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.22
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.22
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) escrow? ( cryptsetup )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.22-1/libblockdev-2.22.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5a069ab02801d6041e861e70125778c
+_md5_=5728ed59c78188eacca054e5e2e25eeb
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.23 b/metadata/md5-cache/sys-libs/libblockdev-2.23
index 178230b96fc8..f3998a09742a 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.23
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.23
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) escrow? ( cryptsetup )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.23-1/libblockdev-2.23.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7f070c1ec7c4b12ad47470dff38388f
+_md5_=00cbefc801fb44d9590d80bbe93f0465
diff --git a/metadata/md5-cache/sys-libs/libblockdev-9999 b/metadata/md5-cache/sys-libs/libblockdev-9999
index 658f39543169..0745b9ee92af 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-9999
+++ b/metadata/md5-cache/sys-libs/libblockdev-9999
@@ -9,6 +9,7 @@ LICENSE=LGPL-2+
 PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) 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_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) escrow? ( cryptsetup )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7f070c1ec7c4b12ad47470dff38388f
+_md5_=00cbefc801fb44d9590d80bbe93f0465
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20180311 b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20180311
index 51097ab2ff1e..7ec40261956a 100644
--- a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20180311
+++ b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20180311
@@ -7,7 +7,8 @@ IUSE=+libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32
 KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/llvm-libunwind[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/libcxxrt-0.0_p20180311.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1849961ed2f47165530213dda4b36f07
+_md5_=3257c6bc9217ff1aa37f2d960a1c6bec
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-9999 b/metadata/md5-cache/sys-libs/libcxxrt-9999
index fdb53ac64658..d9abf8f683aa 100644
--- a/metadata/md5-cache/sys-libs/libcxxrt-9999
+++ b/metadata/md5-cache/sys-libs/libcxxrt-9999
@@ -7,6 +7,7 @@ IUSE=+libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32
 LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/llvm-libunwind[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=82a8474ab678f72aa9cea995c3123ddc
+_md5_=02566e956dfa7274143cdeaf292f7762
diff --git a/metadata/md5-cache/sys-libs/libhugetlbfs-2.21 b/metadata/md5-cache/sys-libs/libhugetlbfs-2.21
index b6dd6b317b45..f861ddc15604 100644
--- a/metadata/md5-cache/sys-libs/libhugetlbfs-2.21
+++ b/metadata/md5-cache/sys-libs/libhugetlbfs-2.21
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/libhugetlbfs/libhugetlbfs
 IUSE=static-libs test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libhugetlbfs/libhugetlbfs/archive/2.21.tar.gz -> libhugetlbfs-2.21.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ff71db22e4acd63339919385e679c90c
+_md5_=708be73f718708bf2107513d4855b630
diff --git a/metadata/md5-cache/sys-libs/libhugetlbfs-2.22 b/metadata/md5-cache/sys-libs/libhugetlbfs-2.22
index 346abf19a832..f3db35f71f0c 100644
--- a/metadata/md5-cache/sys-libs/libhugetlbfs-2.22
+++ b/metadata/md5-cache/sys-libs/libhugetlbfs-2.22
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/libhugetlbfs/libhugetlbfs
 IUSE=static-libs test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86
 LICENSE=GPL-2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libhugetlbfs/libhugetlbfs/archive/2.22.tar.gz -> libhugetlbfs-2.22.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=af0632cb64c0b0d60cf06c34d7e5c79f
+_md5_=fd9852f25c5bb3cf926ddf660eae1306
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.2.0 b/metadata/md5-cache/sys-libs/libosinfo-1.2.0
index 6dc5ee439293..52f22516c4fa 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.2.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.2.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0.0 sys-apps/hwids[pci,usb] sys-apps/osinfo-db-tools sys-apps/osinfo-db introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4de79ff60c28d2028bd8eb84d0fd4b50
+_md5_=c3be35fa08b0a59d7202186d7a4731ab
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.3.0 b/metadata/md5-cache/sys-libs/libosinfo-1.3.0
index 2aa23abe04b5..4fdc434726c8 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.3.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.3.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38.0:2 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0.0 sys-apps/hwids[pci,usb] sys-apps/osinfo-db-tools sys-apps/osinfo-db introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=769384496a265ce806896c462994c23c
+_md5_=daa52e822586371768a3cde7b1f7e5dd
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.4.0 b/metadata/md5-cache/sys-libs/libosinfo-1.4.0
index da72b1410209..14d1db08f172 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.4.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.4.0
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38.0:2 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0.0 sys-apps/hwids[pci,usb] sys-apps/osinfo-db-tools sys-apps/osinfo-db introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5403abe8459418dc208e1babc80f998e
+_md5_=cbca393fad37e15ea250b2e971ce1df3
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.1_p20181020 b/metadata/md5-cache/sys-libs/ncurses-6.1_p20181020
index b02b8bac4c99..a95380e8a6fe 100644
--- a/metadata/md5-cache/sys-libs/ncurses-6.1_p20181020
+++ b/metadata/md5-cache/sys-libs/ncurses-6.1_p20181020
@@ -7,7 +7,8 @@ IUSE=ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86
 LICENSE=MIT
 RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=sys-libs/ncurses-5.9-r4:5 !<sys-libs/slang-2.3.2_pre23 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1
+RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/ncurses/ncurses-6.1.tar.gz ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20181020-patch.sh.bz2 https://invisible-mirror.net/archives/ncurses/6.1/ncurses-6.1-20181020-patch.sh.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=15dc7ff5b2c5854c206ddd9fe778335d
+_md5_=f054758328550de084465602bf7b9cee
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.1_p20190609 b/metadata/md5-cache/sys-libs/ncurses-6.1_p20190609
index 3eb6a280fd82..2c48a69116a2 100644
--- a/metadata/md5-cache/sys-libs/ncurses-6.1_p20190609
+++ b/metadata/md5-cache/sys-libs/ncurses-6.1_p20190609
@@ -7,7 +7,8 @@ IUSE=ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=sys-libs/ncurses-5.9-r4:5 !<sys-libs/slang-2.3.2_pre23 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1
+RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/ncurses/ncurses-6.1.tar.gz ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190609-patch.sh.bz2 https://invisible-mirror.net/archives/ncurses/6.1/ncurses-6.1-20190609-patch.sh.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=7cae2d41b390a7f3a9333ffc9e1a8b13
+_md5_=be647cd9930268da9ff73c060cb79718
diff --git a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.3 b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.3
index 285cb932e22c..a615e4b3b63a 100644
--- a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.3
+++ b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.3
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/nss_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/nss_wrapper-1.1.3.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0622131c06e9f9d5d5e132d3335c5855
+_md5_=ca254346c078d53c570de00758dd0f96
diff --git a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.5 b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.5
index 9ebdae0c6773..68aa4fee1dec 100644
--- a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.5
+++ b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.5
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/nss_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/nss_wrapper-1.1.5.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=10e74b3b259b5e56e313e202fb103091
+_md5_=9e82be3f4a63cbe19572df4037b789a3
diff --git a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.6 b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.6
index 41627b5252e5..b4e035a63707 100644
--- a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.6
+++ b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.6
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/nss_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/nss_wrapper-1.1.6.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88bf0f9a8aca1ac88887a0f3b31989da
+_md5_=9e82be3f4a63cbe19572df4037b789a3
diff --git a/metadata/md5-cache/sys-libs/pam-1.2.1-r2 b/metadata/md5-cache/sys-libs/pam-1.2.1-r2
index f0572a236b1b..1278bcc92d9e 100644
--- a/metadata/md5-cache/sys-libs/pam-1.2.1-r2
+++ b/metadata/md5-cache/sys-libs/pam-1.2.1-r2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh spa
 LICENSE=|| ( BSD GPL-2 )
 PDEPEND=sys-auth/pambase
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( >=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-apps/openrc-0.11.8 !sys-auth/pam_userdb
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.linux-pam.org/library/Linux-PAM-1.2.1.tar.bz2 http://www.linux-pam.org/documentation/Linux-PAM-1.2.0-docs.tar.bz2
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=697447da929af3193426f3e558ebc1ba
+_md5_=1495fd9390d41cf677ed9aaf99754da2
diff --git a/metadata/md5-cache/sys-libs/pam-1.3.0-r2 b/metadata/md5-cache/sys-libs/pam-1.3.0-r2
index 09244aadcfb4..df00c6e77674 100644
--- a/metadata/md5-cache/sys-libs/pam-1.3.0-r2
+++ b/metadata/md5-cache/sys-libs/pam-1.3.0-r2
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh spa
 LICENSE=|| ( BSD GPL-2 )
 PDEPEND=sys-auth/pambase vim-syntax? ( app-editors/vim )
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) audit? ( >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nis? ( >=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-apps/openrc-0.11.8 !sys-auth/pam_userdb
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.linux-pam.org/library/Linux-PAM-1.3.0.tar.bz2 http://www.linux-pam.org/library/Linux-PAM-1.3.0-docs.tar.bz2
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6d3d8f3b90c4c18b9421fc94dd3d65cb
+_md5_=4f90d288ee6cfc6be260672f8471997b
diff --git a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.1 b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.1
index 9ab180b765ac..44750b768751 100644
--- a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.1
+++ b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.1
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/uid_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/pub/cwrap/uid_wrapper-1.2.1.tar.gz https://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.1.tar.gz https://git.samba.org/?p=uid_wrapper.git;a=blobdiff_plain;f=src/uid_wrapper.c;h=ded857a1b18f4744bac324b0ccaee3b2d2d146fa;hp=34889e0c3f955ad04bda3859b734a86763dee529;hb=cf2b35344d4de927f158a1e6d5b6bbc1be2ffd96;hpb=a00a6b8b300b7baa867191e2bc016b835cf8d1b3 -> uid_wrapper-1.2.1-alpha_fix.patch
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7dde74db4b8cb08badec0210f30e7578
+_md5_=1416476673a3021167e97f97ac2b39bd
diff --git a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.4 b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.4
index 7416b74f98f7..6ef81dc1b0f2 100644
--- a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.4
+++ b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.4
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/uid_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/pub/cwrap/uid_wrapper-1.2.4.tar.gz https://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.4.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4302d869ca56ba63a8b423258cb6d291
+_md5_=a68ea71ad762f72b2f01c15af05a3c0e
diff --git a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.7 b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.7
index c0c946eac413..3f84f91ad5c1 100644
--- a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.7
+++ b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.7
@@ -6,7 +6,8 @@ HOMEPAGE=https://cwrap.org/uid_wrapper.html
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/pub/cwrap/uid_wrapper-1.2.7.tar.gz https://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.7.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae1a59ce14f373b5d405383d4b6d035d
+_md5_=ce163e55ea3696d8c391ead96870083b
diff --git a/metadata/md5-cache/sys-power/iasl-20180810 b/metadata/md5-cache/sys-power/iasl-20180810
index 54ade5ff6b62..0a70a4ab6ae1 100644
--- a/metadata/md5-cache/sys-power/iasl-20180810
+++ b/metadata/md5-cache/sys-power/iasl-20180810
@@ -6,7 +6,8 @@ HOMEPAGE=https://www.acpica.org/downloads/
 IUSE=test
 KEYWORDS=amd64 ~arm64 ppc ~ppc64 x86
 LICENSE=iASL
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.acpica.org/sites/acpica/files/acpica-unix-20180810.tar.gz test? ( http://www.acpica.org/sites/acpica/files/acpitests-unix-20180810.tar.gz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=657f0c96387c46db1f3e584da4e8b25d
+_md5_=6e8e5fd58ea2b0437452d474dc86bc67
diff --git a/metadata/md5-cache/sys-power/iasl-20190215 b/metadata/md5-cache/sys-power/iasl-20190215
index 5ec211525416..f921f5fa9e9e 100644
--- a/metadata/md5-cache/sys-power/iasl-20190215
+++ b/metadata/md5-cache/sys-power/iasl-20190215
@@ -6,7 +6,8 @@ HOMEPAGE=https://www.acpica.org/downloads/
 IUSE=test
 KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=iASL
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.acpica.org/sites/acpica/files/acpica-unix-20190215.tar.gz test? ( http://www.acpica.org/sites/acpica/files/acpitests-unix-20190215.tar.gz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9a8a21e470966b6ac95389f07925f994
+_md5_=640feed11d97f8ac8410b19ca8a5eae8
diff --git a/metadata/md5-cache/sys-power/iasl-20190703 b/metadata/md5-cache/sys-power/iasl-20190703
index a3df02865871..47330cd80c24 100644
--- a/metadata/md5-cache/sys-power/iasl-20190703
+++ b/metadata/md5-cache/sys-power/iasl-20190703
@@ -6,7 +6,8 @@ HOMEPAGE=https://www.acpica.org/downloads/
 IUSE=test
 KEYWORDS=amd64 ~arm64 ppc x86
 LICENSE=iASL
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.acpica.org/sites/acpica/files/acpica-unix-20190703.tar.gz test? ( http://www.acpica.org/sites/acpica/files/acpitests-unix-20190703.tar.gz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=52d9ed08eb1ad6f01a1d83da89043202
+_md5_=ef3deffdb3b3eea8b996bfaf982dc1f4
diff --git a/metadata/md5-cache/sys-process/glances-3.1.0 b/metadata/md5-cache/sys-process/glances-3.1.0
index dd07e0213089..e23930c43f23 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.0
+++ b/metadata/md5-cache/sys-process/glances-3.1.0
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=>=dev-python/psutil-5.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.0.tar.gz -> glances-3.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=02fec2d8db56058829489141e00afcdc
+_md5_=e1dac73ab46dacd7cbeada4ac0a2e185
diff --git a/metadata/md5-cache/sys-process/glances-3.1.1 b/metadata/md5-cache/sys-process/glances-3.1.1
index 44c7cbecbc99..ffecb45dc2be 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.1
+++ b/metadata/md5-cache/sys-process/glances-3.1.1
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-5.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.1.tar.gz -> glances-3.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97c129fd36a82b48c3ce2b082655d4c0
+_md5_=98594b94bf1d42c1e402e2df0764058e
diff --git a/metadata/md5-cache/sys-process/glances-3.1.2 b/metadata/md5-cache/sys-process/glances-3.1.2
index 198131812409..10ff2ecdc48d 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.2
+++ b/metadata/md5-cache/sys-process/glances-3.1.2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-5.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.2.tar.gz -> glances-3.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97c129fd36a82b48c3ce2b082655d4c0
+_md5_=98594b94bf1d42c1e402e2df0764058e
diff --git a/metadata/md5-cache/sys-process/procps-3.3.15-r1 b/metadata/md5-cache/sys-process/procps-3.3.15-r1
index 850884f763d5..413ae4222fca 100644
--- a/metadata/md5-cache/sys-process/procps-3.3.15-r1
+++ b/metadata/md5-cache/sys-process/procps-3.3.15-r1
@@ -7,7 +7,8 @@ IUSE=elogind +kill modern-top +ncurses nls selinux static-libs systemd test unic
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd ) kill? ( !sys-apps/coreutils[kill] !sys-apps/util-linux[kill] ) !<sys-apps/sysvinit-2.88-r6
+RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://sourceforge/procps-ng/procps-ng-3.3.15.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=373ddea712195ff0569cae236f1fa026
+_md5_=2bdbd134e6cd4a351cf8374996806931
diff --git a/metadata/md5-cache/sys-process/procps-3.3.16 b/metadata/md5-cache/sys-process/procps-3.3.16
index 301db57e76f5..66acf4b6de88 100644
--- a/metadata/md5-cache/sys-process/procps-3.3.16
+++ b/metadata/md5-cache/sys-process/procps-3.3.16
@@ -7,7 +7,8 @@ IUSE=elogind +kill modern-top +ncurses nls selinux static-libs systemd test unic
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd ) kill? ( !sys-apps/coreutils[kill] !sys-apps/util-linux[kill] ) !<sys-apps/sysvinit-2.88-r6
+RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=mirror://sourceforge/procps-ng/procps-ng-3.3.16.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=e3a4e702574698dfd1885d37edf64afa
+_md5_=b62fcdae1f407087039afe5bb4ab61f7
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1 b/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
index c8a6a6c50be5..0b34629d84d5 100644
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
+++ b/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 sparc x86
 LICENSE=MIT
 RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-process/cronbase
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.5.12.tar.gz -> systemd-cron-1.5.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=878adc8e7752e154d6e4f424ad07539c
+_md5_=40cd22e5884f60d46406584d58c26f09
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.14 b/metadata/md5-cache/sys-process/systemd-cron-1.5.14
index 6bc3a38f9c91..048188dc5f6f 100644
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.14
+++ b/metadata/md5-cache/sys-process/systemd-cron-1.5.14
@@ -9,7 +9,8 @@ KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_5? ( dev-lang/python:3.5 >=dev-lang/python-exec-2:=[python_targets_python3_5] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-process/cronbase
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.5.14.tar.gz -> systemd-cron-1.5.14.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d9a4797f8b3f41b4e50b93d025384108
+_md5_=4ad227e6ed6afa4d475236f947957817
diff --git a/metadata/md5-cache/virtual/podofo-build-0.9.6 b/metadata/md5-cache/virtual/podofo-build-0.9.6
index 7cb4825feb6c..1b9e72fca4d7 100644
--- a/metadata/md5-cache/virtual/podofo-build-0.9.6
+++ b/metadata/md5-cache/virtual/podofo-build-0.9.6
@@ -4,5 +4,6 @@ EAPI=6
 IUSE=+boost idn debug test +tools
 KEYWORDS=amd64 ~arm hppa ppc ppc64 ~sparc x86
 RDEPEND=app-text/podofo:0/0.9.6[boost=,idn=,debug=,test=,tools=] boost? ( dev-libs/boost )
+RESTRICT=!test? ( test )
 SLOT=0/0.9.6
-_md5_=642cde2bb4c10491cdaff4642675dfb7
+_md5_=393d612b7a6648bb9d5fd8833e135695
diff --git a/metadata/md5-cache/virtual/podofo-build-0.9.6_pre20170508-r1 b/metadata/md5-cache/virtual/podofo-build-0.9.6_pre20170508-r1
index 4984b776e011..89ff86aaea5c 100644
--- a/metadata/md5-cache/virtual/podofo-build-0.9.6_pre20170508-r1
+++ b/metadata/md5-cache/virtual/podofo-build-0.9.6_pre20170508-r1
@@ -4,5 +4,6 @@ EAPI=6
 IUSE=+boost idn debug test +tools
 KEYWORDS=amd64 ~arm hppa ppc ppc64 ~sparc x86
 RDEPEND=app-text/podofo:0/0.9.6_pre20170508-r1[boost=,idn=,debug=,test=,tools=] boost? ( dev-libs/boost )
+RESTRICT=!test? ( test )
 SLOT=0/0.9.6_pre20170508-r1
-_md5_=3d5e61852c841432b45171945e52b12b
+_md5_=5b72be1a8392f2b871ac996bcdfb922a
diff --git a/metadata/md5-cache/virtual/podofo-build-0.9.6_pre20171027 b/metadata/md5-cache/virtual/podofo-build-0.9.6_pre20171027
index c43f53c056d7..b37ec9fa3395 100644
--- a/metadata/md5-cache/virtual/podofo-build-0.9.6_pre20171027
+++ b/metadata/md5-cache/virtual/podofo-build-0.9.6_pre20171027
@@ -4,5 +4,6 @@ EAPI=6
 IUSE=+boost idn debug test +tools
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 RDEPEND=app-text/podofo:0/0.9.6_pre20171027[boost=,idn=,debug=,test=,tools=] boost? ( dev-libs/boost )
+RESTRICT=!test? ( test )
 SLOT=0/0.9.6_pre20171027
-_md5_=c606dc96dcfcb9cdb46293c051b668e6
+_md5_=7e69e089196576b8230baa6ebd799374
diff --git a/metadata/md5-cache/www-apache/mod_perl-2.0.10 b/metadata/md5-cache/www-apache/mod_perl-2.0.10
index 2a6f129b79b3..34fdc0b84850 100644
--- a/metadata/md5-cache/www-apache/mod_perl-2.0.10
+++ b/metadata/md5-cache/www-apache/mod_perl-2.0.10
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 ~arm ppc ppc64 x86
 LICENSE=Apache-2.0
 PDEPEND=>=dev-perl/Apache-Reload-0.130.0 >=dev-perl/Apache-SizeLimit-0.970.0
 RDEPEND=dev-lang/perl[ithreads=] >=dev-perl/Apache-Test-1.400.0 >=www-servers/apache-2.0.47 >=dev-libs/apr-util-1.4 !ithreads? ( www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork] ) =www-servers/apache-2* dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://apache/perl/mod_perl-2.0.10.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a10cf207f8509b3c3c768fbeed1d2edc
+_md5_=6d1031c6c5b87666df175b15e1e03e0c
diff --git a/metadata/md5-cache/www-apps/blohg-0.13-r3 b/metadata/md5-cache/www-apps/blohg-0.13-r3
index 496c649123c4..928780856505 100644
--- a/metadata/md5-cache/www-apps/blohg-0.13-r3
+++ b/metadata/md5-cache/www-apps/blohg-0.13-r3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/click-2.0 >=dev-python/docutils-0.11 >=dev-python/flask-0.10.1 >=dev-python/flask-babel-0.7 >=dev-python/frozen-flask-0.7 >=dev-python/jinja-2.5.2 dev-python/pyyaml dev-python/setuptools dev-python/pygments git? ( >=dev-python/pygit2-0.21.3 ) mercurial? ( >=dev-vcs/mercurial-1.6 ) python_targets_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(-)]
 REQUIRED_USE=|| ( git mercurial ) test? ( git mercurial ) || ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blohg/blohg-0.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f290e9880a72afeb3a66b37a8f1fc823
+_md5_=da083a65e47b32125726913e2ccefb85
diff --git a/metadata/md5-cache/www-apps/blohg-9999 b/metadata/md5-cache/www-apps/blohg-9999
index 00acebedd9d0..0c4128f4d426 100644
--- a/metadata/md5-cache/www-apps/blohg-9999
+++ b/metadata/md5-cache/www-apps/blohg-9999
@@ -8,6 +8,7 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-python/click-2.0 >=dev-python/docutils-0.11 >=dev-python/flask-0.10.1 >=dev-python/flask-babel-0.7 >=dev-python/frozen-flask-0.7 >=dev-python/jinja-2.5.2 dev-python/pyyaml dev-python/setuptools dev-python/pygments git? ( >=dev-python/pygit2-0.21.3 ) mercurial? ( >=dev-vcs/mercurial-1.6 ) python_targets_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(-)]
 REQUIRED_USE=|| ( git mercurial ) test? ( git mercurial ) || ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8d372f233f4abb07a1a6decb35ecdea
+_md5_=ead9f9d050b24b3b115183263aba55cc
diff --git a/metadata/md5-cache/www-apps/bugzilla-4.4.12-r2 b/metadata/md5-cache/www-apps/bugzilla-4.4.12-r2
index 1791dcc7df6e..54979e36b001 100644
--- a/metadata/md5-cache/www-apps/bugzilla-4.4.12-r2
+++ b/metadata/md5-cache/www-apps/bugzilla-4.4.12-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MPL-2.0
 RDEPEND=virtual/httpd-cgi >=dev-lang/perl-5.10.1 >=dev-perl/CGI-3.510.0 virtual/perl-Digest-SHA >=dev-perl/DateTime-0.500.0 >=dev-perl/DateTime-TimeZone-0.710.0 >=dev-perl/DBI-1.601.0 >=dev-perl/Template-Toolkit-2.22 >=dev-perl/Email-Send-2.40.0 >=dev-perl/Email-MIME-1.904.0 dev-perl/URI >=dev-perl/List-MoreUtils-0.329.0 dev-perl/Math-Random-ISAAC postgres? ( >=dev-perl/DBD-Pg-1.49.0 ) mysql? ( >=dev-perl/DBD-mysql-4.0.5 ) sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 ) extras? ( >=dev-perl/GD-2.35[png,truetype] >=dev-perl/Chart-2.4.1 dev-perl/Template-GD dev-perl/GDTextUtil dev-perl/GDGraph dev-perl/XML-Twig >=dev-perl/MIME-tools-5.427.0 dev-perl/libwww-perl >=dev-perl/PatchReader-0.9.6 dev-perl/perl-ldap dev-perl/Authen-Radius dev-perl/Authen-SASL >=dev-perl/SOAP-Lite-0.712.0 dev-perl/JSON-RPC >=dev-perl/JSON-XS-2.0.0 dev-perl/Test-Taint >=dev-perl/HTML-Parser-3.67.0 dev-perl/HTML-Scrubber >=virtual/perl-Encode-2.21.0 dev-perl/Encode-Detect dev-perl/Email-MIME-Attachment-Stripper dev-perl/Email-Reply dev-perl/TheSchwartz dev-perl/Daemon-Generic dev-perl/File-MimeInfo virtual/imagemagick-tools[perl] dev-perl/MIME-tools ) modperl? ( www-apache/mod_perl:1 >=dev-perl/Apache-SizeLimit-0.96.0 ) graphviz? ( media-gfx/graphviz ) modperl? ( =www-servers/apache-2* ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=!test? ( test )
 SLOT=4.4.12-r2
 SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-4.4.12.tar.gz
 _eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=105310aaec0f51a4ae0a8e736df4ba45
+_md5_=2f4433cfb94e8def9bc55507fc4ec118
diff --git a/metadata/md5-cache/www-apps/bugzilla-5.0.3-r2 b/metadata/md5-cache/www-apps/bugzilla-5.0.3-r2
index 5c4d55065527..16dae39e804c 100644
--- a/metadata/md5-cache/www-apps/bugzilla-5.0.3-r2
+++ b/metadata/md5-cache/www-apps/bugzilla-5.0.3-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=MPL-2.0
 RDEPEND=virtual/httpd-cgi dev-lang/perl >=dev-perl/CGI-3.510.0 >=dev-perl/DBI-1.614.0 >=dev-perl/TimeDate-2.230.0 >=dev-perl/DateTime-0.750.0 >=dev-perl/DateTime-TimeZone-1.640.0 virtual/perl-Digest-SHA >=dev-perl/Email-MIME-1.904.0 >=dev-perl/Email-Sender-1.300.11 >=dev-perl/File-Slurp-9999.130.0 >=dev-perl/JSON-XS-2.10.0 >=dev-perl/List-MoreUtils-0.320.0 >=dev-perl/Math-Random-ISAAC-1.0.1 >=dev-perl/Template-Toolkit-2.240.0 >=dev-perl/URI-1.550.0 postgres? ( >=dev-perl/DBD-Pg-1.49 ) mysql? ( >=dev-perl/DBD-mysql-4.0.5 ) sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 ) extras? ( >=dev-perl/GD-2.350.0[png,truetype] >=dev-perl/Chart-2.4.1 dev-perl/Template-GD dev-perl/GDTextUtil dev-perl/GDGraph dev-perl/XML-Twig >=dev-perl/MIME-tools-5.427.0 dev-perl/libwww-perl >=dev-perl/PatchReader-0.9.6 dev-perl/perl-ldap dev-perl/Authen-Radius dev-perl/Authen-SASL >=dev-perl/SOAP-Lite-0.712.0 dev-perl/JSON-RPC >=dev-perl/JSON-XS-2.0.0 dev-perl/Test-Taint >=dev-perl/HTML-Parser-3.670.0 dev-perl/HTML-Scrubber >=virtual/perl-Encode-2.210.0 dev-perl/Encode-Detect dev-perl/Email-MIME-Attachment-Stripper dev-perl/Email-Reply dev-perl/TheSchwartz dev-perl/Daemon-Generic dev-perl/File-MimeInfo virtual/imagemagick-tools[perl] dev-perl/MIME-tools ) modperl? ( www-apache/mod_perl:1 >=dev-perl/Apache-SizeLimit-0.960.0 ) graphviz? ( media-gfx/graphviz ) modperl? ( =www-servers/apache-2* ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=!test? ( test )
 SLOT=5.0.3-r2
 SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-5.0.3.tar.gz
 _eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=a0be7756cc704647548c1d42d941ea0a
+_md5_=c0f2c7aee2f90d9a6d42aac37ba11ffb
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20170111 b/metadata/md5-cache/www-apps/ikiwiki-3.20170111
index 523ceb45573a..18b71a9ef508 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20170111
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20170111
@@ -7,7 +7,8 @@ IUSE=extras minimal test
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Scrubber dev-perl/HTML-Template dev-perl/URI dev-perl/Text-Markdown dev-perl/TimeDate dev-perl/YAML-LibYAML !minimal? ( dev-perl/CGI >=dev-perl/CGI-FormBuilder-3.0202 >=dev-perl/CGI-Session-4.14 dev-perl/Mail-Sendmail dev-perl/Term-ReadLine-Gnu dev-perl/XML-Simple media-gfx/imagemagick[perl] extras? ( dev-python/docutils dev-perl/Digest-SHA1 dev-perl/File-MimeInfo dev-perl/RPC-XML dev-perl/XML-Feed dev-perl/LWPx-ParanoidAgent dev-perl/Net-OpenID-Consumer ) ) dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20170111.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5900076182bfc66a8a1276c1eff19677
+_md5_=a1f8be3e449e7a27fd87207983a76265
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20171001 b/metadata/md5-cache/www-apps/ikiwiki-3.20171001
index b699bd08cc24..71d48ee22b8f 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20171001
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20171001
@@ -7,7 +7,8 @@ IUSE=extras minimal test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Scrubber dev-perl/HTML-Template dev-perl/URI dev-perl/Text-Markdown dev-perl/TimeDate dev-perl/YAML-LibYAML !minimal? ( dev-perl/CGI >=dev-perl/CGI-FormBuilder-3.0202 >=dev-perl/CGI-Session-4.14 dev-perl/Mail-Sendmail dev-perl/Term-ReadLine-Gnu dev-perl/XML-Simple media-gfx/imagemagick[perl] extras? ( dev-python/docutils dev-perl/Digest-SHA1 dev-perl/File-MimeInfo dev-perl/RPC-XML dev-perl/XML-Feed dev-perl/LWPx-ParanoidAgent dev-perl/Net-OpenID-Consumer ) ) dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20171001.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d29b71778eb90d89b012402c1e1cfd65
+_md5_=f8480baa5e6cb1111df717546ec79280
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20190228 b/metadata/md5-cache/www-apps/ikiwiki-3.20190228
index 0a6f40183d01..299646c290af 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20190228
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20190228
@@ -7,7 +7,8 @@ IUSE=extras minimal test
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Scrubber dev-perl/HTML-Template dev-perl/URI dev-perl/Text-Markdown dev-perl/TimeDate dev-perl/YAML-LibYAML !minimal? ( dev-perl/CGI >=dev-perl/CGI-FormBuilder-3.0202 >=dev-perl/CGI-Session-4.14 dev-perl/Mail-Sendmail dev-perl/Term-ReadLine-Gnu dev-perl/XML-Simple media-gfx/imagemagick[perl] extras? ( dev-python/docutils dev-perl/Digest-SHA1 dev-perl/File-MimeInfo dev-perl/RPC-XML dev-perl/XML-Feed dev-perl/LWPx-ParanoidAgent dev-perl/Net-OpenID-Consumer ) ) dev-lang/perl:=[-build(-)]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20190228.orig.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c97cee775a8f192dd2a23092c6d6e63
+_md5_=f85fe9b2c322445d899cf3dd42707f1a
diff --git a/metadata/md5-cache/www-apps/venus-20100911-r1 b/metadata/md5-cache/www-apps/venus-20100911-r1
index 6858ee58e5b8..52cff88f2073 100644
--- a/metadata/md5-cache/www-apps/venus-20100911-r1
+++ b/metadata/md5-cache/www-apps/venus-20100911-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=PSF-2.2
 RDEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/utidylib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] django? ( dev-python/django[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) genshi? ( dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) redland? ( dev-python/rdflib[redland,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_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] ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/venus-20100911.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=93f46599d4d6d7e45e0ebd13bf96237f
+_md5_=5dda6c1d74898d3f0d9cf93ea6178a78
diff --git a/metadata/md5-cache/www-apps/venus-20100911-r2 b/metadata/md5-cache/www-apps/venus-20100911-r2
index 8779d9137aff..2c0a75c07a35 100644
--- a/metadata/md5-cache/www-apps/venus-20100911-r2
+++ b/metadata/md5-cache/www-apps/venus-20100911-r2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=PSF-2.2
 RDEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/utidylib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] django? ( dev-python/django[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) genshi? ( dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) redland? ( dev-python/rdflib[redland,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_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] ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/venus-20100911.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=ec78e405e6b81e317ecd95d72722601f
+_md5_=95da7889b2e8757e432b0640c6170224
diff --git a/metadata/md5-cache/www-client/epiphany-3.30.4 b/metadata/md5-cache/www-client/epiphany-3.30.4
index 24c5966dea5d..88ed7e8caec9 100644
--- a/metadata/md5-cache/www-client/epiphany-3.30.4
+++ b/metadata/md5-cache/www-client/epiphany-3.30.4
@@ -7,7 +7,8 @@ IUSE=test test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.21.92:4= >=x11-libs/cairo-1.2 >=dev-libs/libdazzle-3.28.0 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.30/epiphany-3.30.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=443335db9c95f718f57e7f24253769db
+_md5_=4b0e3d10824d3a50224204ed48b4637a
diff --git a/metadata/md5-cache/www-client/epiphany-3.30.5 b/metadata/md5-cache/www-client/epiphany-3.30.5
index 76c466687962..2b79cb815fe6 100644
--- a/metadata/md5-cache/www-client/epiphany-3.30.5
+++ b/metadata/md5-cache/www-client/epiphany-3.30.5
@@ -7,7 +7,8 @@ IUSE=test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.21.92:4= >=x11-libs/cairo-1.2 >=dev-libs/libdazzle-3.28.0 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.30/epiphany-3.30.5.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0ee178ac64f35f0dc53798e785054cd
+_md5_=dd7980825c59d8d13309af1e670b9794
diff --git a/metadata/md5-cache/www-client/epiphany-3.32.5 b/metadata/md5-cache/www-client/epiphany-3.32.5
index b1f7def0584d..ca3106ffd0e7 100644
--- a/metadata/md5-cache/www-client/epiphany-3.32.5
+++ b/metadata/md5-cache/www-client/epiphany-3.32.5
@@ -8,7 +8,8 @@ IUSE=test test
 KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.24.1:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=dev-libs/libdazzle-3.31.90 >=gui-libs/libhandy-0.0.9:0.0= >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 dev-db/sqlite:3 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.32/epiphany-3.32.5.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f6c4e65c0e2216ee41edfebae51dd35
+_md5_=0f9048106ce8f9d3b255d5831a26dcc0
diff --git a/metadata/md5-cache/www-client/luakit-2017.08.10 b/metadata/md5-cache/www-client/luakit-2017.08.10
index 7e05624ec5f6..5b75159dee12 100644
--- a/metadata/md5-cache/www-client/luakit-2017.08.10
+++ b/metadata/md5-cache/www-client/luakit-2017.08.10
@@ -7,7 +7,8 @@ IUSE=doc luajit test
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-lua/luafilesystem[luajit=] net-libs/webkit-gtk:4= x11-libs/gtk+:3 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luakit/luakit/archive/2017.08.10.tar.gz -> luakit-2017.08.10.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c2db8186f7a32b2799a8d2caf4b2a178
+_md5_=700f083a8f0097d8661426eb0a71645d
diff --git a/metadata/md5-cache/www-client/luakit-9999 b/metadata/md5-cache/www-client/luakit-9999
index eb8d0c2c0e2e..6bdb74304157 100644
--- a/metadata/md5-cache/www-client/luakit-9999
+++ b/metadata/md5-cache/www-client/luakit-9999
@@ -7,6 +7,7 @@ IUSE=doc luajit test
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-lua/luafilesystem[luajit=] net-libs/webkit-gtk:4= x11-libs/gtk+:3 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=af3e7ccbb1534cf14758429bbe415c76
+_md5_=9933a837655d42c803c468015d840651
diff --git a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2 b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2
index 2f1d1442382a..280b1fa3942d 100644
--- a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2
+++ b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-python/socketio-client-0.6.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.cousteau/ripe.atlas.cousteau-1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ab2a06d44969478e13eaff3b5657d307
+_md5_=4590a79fd481ba4a0d295f90dc57d834
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.5-r1 b/metadata/md5-cache/www-client/seamonkey-2.49.5-r1
index 2fd6c898d342..ea566413aba9 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.5-r1
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.5-r1
@@ -7,7 +7,8 @@ IUSE=+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +r
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.49.5/source/seamonkey-2.49.5.source.tar.xz -> seamonkey-2.49.5.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.49.5/source/seamonkey-2.49.5.source-l10n.tar.xz -> seamonkey-2.49.5.source-l10n.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.49.5-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.49.5-patches-01.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.52	43edd59f1e8e1f9536f3c0d3703ece9d	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef92f101b64a3bb23ac885470be6ffde
+_md5_=37ffc58f14b0218a0f34a9024e09152d
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0
index c4ddebcfcee8..f101dd46bf8e 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0
@@ -7,7 +7,8 @@ IUSE=+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +r
 KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/source/thunderbird-52.9.1.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.9.1-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.9.1-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.9.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.9.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.9.1-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.9.1-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.9.1-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.9.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.9.1-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.9.1-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.9.1-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.9.1-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.9.1-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.9.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.9.1-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.9.1-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.9.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.9.1-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.52	43edd59f1e8e1f9536f3c0d3703ece9d	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6275dbb5d83d2efcea1ea116dbc24c30
+_md5_=6e90bdd81a0f4c72605f3080b4c74a34
diff --git a/metadata/md5-cache/www-misc/buku-3.5 b/metadata/md5-cache/www-misc/buku-3.5
index a288a8b99707..bcd7b9097561 100644
--- a/metadata/md5-cache/www-misc/buku-3.5
+++ b/metadata/md5-cache/www-misc/buku-3.5
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/beautifulsoup:4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/urllib3-1.13.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-3.5.tar.gz -> buku-3.5.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc6e89d68d325e2f7c6c468674e4b07e
+_md5_=dc200071165e09a6eda14f344e6555c9
diff --git a/metadata/md5-cache/www-misc/buku-3.6 b/metadata/md5-cache/www-misc/buku-3.6
index 26bf47115573..6484fc488103 100644
--- a/metadata/md5-cache/www-misc/buku-3.6
+++ b/metadata/md5-cache/www-misc/buku-3.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/beautifulsoup:4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/urllib3-1.13.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-3.6.tar.gz -> buku-3.6.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc6e89d68d325e2f7c6c468674e4b07e
+_md5_=dc200071165e09a6eda14f344e6555c9
diff --git a/metadata/md5-cache/www-misc/buku-3.7 b/metadata/md5-cache/www-misc/buku-3.7
index 86332de2e39a..675b406bfc00 100644
--- a/metadata/md5-cache/www-misc/buku-3.7
+++ b/metadata/md5-cache/www-misc/buku-3.7
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/beautifulsoup:4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/urllib3-1.13.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-3.7.tar.gz -> buku-3.7.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe0da8d81acf83235899bd0ec4078c3d
+_md5_=2b4309c1900facfab5dfaeb024969d5b
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.13 b/metadata/md5-cache/www-misc/urlwatch-2.13
index bdf5ab04af92..509e552a26d1 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.13
+++ b/metadata/md5-cache/www-misc/urlwatch-2.13
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pyyaml-5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46c67a5d1536f3d76a99ce75a279ffaa
+_md5_=5ee9da5fc536ae3aae866e8b32d2b0d4
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.16 b/metadata/md5-cache/www-misc/urlwatch-2.16
index 90672c7084b4..458035b634e8 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.16
+++ b/metadata/md5-cache/www-misc/urlwatch-2.16
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pyyaml-5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.16.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bdc43c69381cec6fb325884b51b96196
+_md5_=8e97dbdd4de183c70523ad708a39f0ec
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.17 b/metadata/md5-cache/www-misc/urlwatch-2.17
index 878ae9f67744..bebacc8f96c3 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.17
+++ b/metadata/md5-cache/www-misc/urlwatch-2.17
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.17.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c72452fb745432c5b1631fe8aa42cedb
+_md5_=300845686cf10d06ca0c9bcab176c9fb
diff --git a/metadata/md5-cache/www-servers/gunicorn-19.8.1 b/metadata/md5-cache/www-servers/gunicorn-19.8.1
index bc705d1b6a48..55f5a6796c0a 100644
--- a/metadata/md5-cache/www-servers/gunicorn-19.8.1
+++ b/metadata/md5-cache/www-servers/gunicorn-19.8.1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT PSF-2 doc? ( BSD )
 RDEPEND=dev-python/setproctitle[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-19.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6439229bbfb475b7777b31450b08978b
+_md5_=0d1dcbba8e8e761b295033a3dfc4fbb6
diff --git a/metadata/md5-cache/www-servers/gunicorn-19.9.0 b/metadata/md5-cache/www-servers/gunicorn-19.9.0
index 64cab71f1df2..cb4cb27a0fc4 100644
--- a/metadata/md5-cache/www-servers/gunicorn-19.9.0
+++ b/metadata/md5-cache/www-servers/gunicorn-19.9.0
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT PSF-2 doc? ( BSD )
 RDEPEND=dev-python/setproctitle[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-19.9.0.tar.gz
 _eclasses_=distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c6d1971d11aa653d857ae2b49506a6ee
+_md5_=b9f037614b4248c7ac3c6108611d7d9f
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.53 b/metadata/md5-cache/www-servers/lighttpd-1.4.53
index 756e46a8af19..41b4da7b77bf 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.53
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.53
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos(-)?] ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl ) webdav? ( sqlite )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.53.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0c6dcbf28b17f43c82a77774e9d81105
+_md5_=94267acacfde2c430f7287359787a91f
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.54 b/metadata/md5-cache/www-servers/lighttpd-1.4.54
index 5f65a52105c0..066329e4af1f 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.54
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.54
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=BSD GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos(-)?] ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl ) webdav? ( sqlite )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.54.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fa8609a16006c505155c77e499ebff90
+_md5_=88e21e1ced075149d413ea6767f2c168
diff --git a/metadata/md5-cache/www-servers/lighttpd-9999 b/metadata/md5-cache/www-servers/lighttpd-9999
index a5ac993166d8..208f0f5fd616 100644
--- a/metadata/md5-cache/www-servers/lighttpd-9999
+++ b/metadata/md5-cache/www-servers/lighttpd-9999
@@ -8,6 +8,7 @@ LICENSE=BSD GPL-2
 PROPERTIES=live
 RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56f5e4ad3606909810c8979ec715f9f3
+_md5_=38e652894a8d3b2424691aa6774bcc38
diff --git a/metadata/md5-cache/www-servers/sniproxy-0.6.0 b/metadata/md5-cache/www-servers/sniproxy-0.6.0
index d74f2d8b2f4b..5b55a735c2c0 100644
--- a/metadata/md5-cache/www-servers/sniproxy-0.6.0
+++ b/metadata/md5-cache/www-servers/sniproxy-0.6.0
@@ -8,7 +8,8 @@ IUSE=+dns +largefile rfc3339 test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libev >=dev-libs/libpcre-3 dns? ( net-libs/udns )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dlundquist/sniproxy/archive/0.6.0.tar.gz -> sniproxy-0.6.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ed00025e6c0771754b533e532188a4b1
+_md5_=893381be872fcd0d0d14a41dd90a272e
diff --git a/metadata/md5-cache/www-servers/tornado-4.4.2-r1 b/metadata/md5-cache/www-servers/tornado-4.4.2-r1
index 693572e795fd..2771fd8874af 100644
--- a/metadata/md5-cache/www-servers/tornado-4.4.2-r1
+++ b/metadata/md5-cache/www-servers/tornado-4.4.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-li
 LICENSE=Apache-2.0
 RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycurl-7.19.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ( python_targets_python2_7? ( dev-python/twisted-names[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) virtual/python-backports_abc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-4.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08e96bad48fc7fb66d759dd96f3dd07d
+_md5_=a546fdd6d38d0cbefd0ec92eedb91f4c
diff --git a/metadata/md5-cache/www-servers/tornado-4.5.1 b/metadata/md5-cache/www-servers/tornado-4.5.1
index 101fb638659e..e8fdaac3e3e9 100644
--- a/metadata/md5-cache/www-servers/tornado-4.5.1
+++ b/metadata/md5-cache/www-servers/tornado-4.5.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycurl-7.19.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ( python_targets_python2_7? ( dev-python/twisted-names[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) virtual/python-backports_abc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-4.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=059350835ce52e7461aed83d9243702e
+_md5_=a218c9cb81dd73d4d9f04f5049a22dbe
diff --git a/metadata/md5-cache/www-servers/tornado-4.5.3 b/metadata/md5-cache/www-servers/tornado-4.5.3
index c3a7a4e442ba..00affef71bc5 100644
--- a/metadata/md5-cache/www-servers/tornado-4.5.3
+++ b/metadata/md5-cache/www-servers/tornado-4.5.3
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-li
 LICENSE=Apache-2.0
 RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycurl-7.19.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ( python_targets_python2_7? ( dev-python/twisted-names[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) virtual/python-backports_abc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-4.5.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4e9938c2212ab47145cf13676d349d6
+_md5_=57314a3be2e456b407a035ffea192dcc
diff --git a/metadata/md5-cache/www-servers/tornado-5.0.2 b/metadata/md5-cache/www-servers/tornado-5.0.2
index 4d0c7e1ca01d..905ea63de7b4 100644
--- a/metadata/md5-cache/www-servers/tornado-5.0.2
+++ b/metadata/md5-cache/www-servers/tornado-5.0.2
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pycurl-7.19.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ( python_targets_python2_7? ( dev-python/twisted-names[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) virtual/python-backports_abc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-5.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9f37733d99c3e1335e65ba9145e8285
+_md5_=d073799a1f2c13f08393e243f8030fb0
diff --git a/metadata/md5-cache/www-servers/tornado-5.1 b/metadata/md5-cache/www-servers/tornado-5.1
index f6cdcaa11d41..011893e847f5 100644
--- a/metadata/md5-cache/www-servers/tornado-5.1
+++ b/metadata/md5-cache/www-servers/tornado-5.1
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pycurl-7.19.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-backports_abc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ebe84a5f61ba2c033b931b3883948ae0
+_md5_=a97e2aeabb0411da8f17f6898ec15d05
diff --git a/metadata/md5-cache/www-servers/xsp-2014.12-r2014120900 b/metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
index df6cc722aa3d..9f6ff762b8bc 100644
--- a/metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
+++ b/metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
@@ -7,7 +7,8 @@ IUSE=doc test developer net35 net40 net45
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-db/sqlite:3
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mono/xsp/archive/e272a2c006211b6b03be2ef5bbb9e3f8fefd0768.zip -> xsp-2014.12.zip
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	dotnet	8450be93278197249eb06f5abffaee0d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b7b36d43ee270c36a527655bb1f9e35f
+_md5_=0c0f2d77f96c68404a7519b001f20e85
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
index 127ba162a725..9f4a6b5f537a 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
@@ -7,7 +7,8 @@ IUSE=X debug +introspection jpeg tiff test abi_x86_32 abi_x86_64 abi_x86_x32 abi
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
+RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.12.tar.xz test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> gdk-pixbuf-2.36.12-bug753605-atsize.jpg )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=389728a229fbceda8491c9ffdb83506b
+_md5_=cd1d7e071cefb4ae5c9ed9730239c50b
diff --git a/metadata/md5-cache/x11-libs/gtk+extra-3.3.3 b/metadata/md5-cache/x11-libs/gtk+extra-3.3.3
index e28a41f551ef..39aa3cd94da6 100644
--- a/metadata/md5-cache/x11-libs/gtk+extra-3.3.3
+++ b/metadata/md5-cache/x11-libs/gtk+extra-3.3.3
@@ -7,7 +7,8 @@ IUSE=+introspection static-libs test
 KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=FDL-1.1 LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.12.0:2 dev-libs/glib:2 introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkextra/gtkextra-3.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=155d370b9f72c32a6a0fe2336832b330
+_md5_=10bb7cba990043a0a281fd7c6115f989
diff --git a/metadata/md5-cache/x11-libs/gtkdatabox-0.9.2.0 b/metadata/md5-cache/x11-libs/gtkdatabox-0.9.2.0
index 83979845f0aa..ad13b5ae268c 100644
--- a/metadata/md5-cache/x11-libs/gtkdatabox-0.9.2.0
+++ b/metadata/md5-cache/x11-libs/gtkdatabox-0.9.2.0
@@ -7,7 +7,8 @@ IUSE=doc examples +glade static-libs test
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=glade? ( gnome-base/libglade ) x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkdatabox/gtkdatabox-0.9.2.0.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_=a6df5617ac97b516fa0c59e53ccd4d2e
+_md5_=a49d01a6f3fd972c20731cc18756c89b
diff --git a/metadata/md5-cache/x11-libs/gtkdatabox-0.9.3.0 b/metadata/md5-cache/x11-libs/gtkdatabox-0.9.3.0
index c74fb354a6bc..a4fa624e109a 100644
--- a/metadata/md5-cache/x11-libs/gtkdatabox-0.9.3.0
+++ b/metadata/md5-cache/x11-libs/gtkdatabox-0.9.3.0
@@ -7,7 +7,8 @@ IUSE=examples +glade static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango glade? ( gnome-base/libglade )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkdatabox/gtkdatabox-0.9.3.0.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_=0e278aa0b404d2e043dd3d93db60261f
+_md5_=5bb613a2cc267f53403f0fdede38aa7c
diff --git a/metadata/md5-cache/x11-libs/libgxim-0.5.0 b/metadata/md5-cache/x11-libs/libgxim-0.5.0
index ac209dae8d22..0c6dbf004704 100644
--- a/metadata/md5-cache/x11-libs/libgxim-0.5.0
+++ b/metadata/md5-cache/x11-libs/libgxim-0.5.0
@@ -7,7 +7,8 @@ IUSE=ruby_targets_ruby24 ruby_targets_ruby25 static-libs test
 KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:2 x11-libs/libX11
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/tagoh/libgxim/downloads/libgxim-0.5.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ad239dd35c4b0496732f4a45cef0027a
+_md5_=9ff658fab97b72741c7c5f0612b22023
diff --git a/metadata/md5-cache/x11-libs/libnotify-0.7.7-r1 b/metadata/md5-cache/x11-libs/libnotify-0.7.7-r1
index be2f6257c125..19f62ec6cbb7 100644
--- a/metadata/md5-cache/x11-libs/libnotify-0.7.7-r1
+++ b/metadata/md5-cache/x11-libs/libnotify-0.7.7-r1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~
 LICENSE=LGPL-2.1+
 PDEPEND=virtual/notification-daemon
 RDEPEND=app-eselect/eselect-notify-send >=dev-libs/glib-2.26:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libnotify/0.7/libnotify-0.7.7.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed5efcec084db9ac16037cb951037120
+_md5_=36ac5fbf721adc2f9a93b9614658537e
diff --git a/metadata/md5-cache/x11-libs/libnotify-0.7.8 b/metadata/md5-cache/x11-libs/libnotify-0.7.8
index c5afbd154e41..6433a822d911 100644
--- a/metadata/md5-cache/x11-libs/libnotify-0.7.8
+++ b/metadata/md5-cache/x11-libs/libnotify-0.7.8
@@ -9,7 +9,8 @@ KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~
 LICENSE=LGPL-2.1+
 PDEPEND=virtual/notification-daemon
 RDEPEND=app-eselect/eselect-notify-send >=dev-libs/glib-2.26:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libnotify/0.7/libnotify-0.7.8.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e48869d9b4414f283a4c3bd70795920c
+_md5_=89d5a85ceda13a0d996ef556c7c0b1d0
diff --git a/metadata/md5-cache/x11-libs/pango-1.42.4-r2 b/metadata/md5-cache/x11-libs/pango-1.42.4-r2
index 579239d71fd9..3eea6698eb55 100644
--- a/metadata/md5-cache/x11-libs/pango-1.42.4-r2
+++ b/metadata/md5-cache/x11-libs/pango-1.42.4-r2
@@ -7,7 +7,8 @@ IUSE=X +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mi
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.12.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.42/pango-1.42.4.tar.xz https://dev.gentoo.org/~leio/distfiles/pango-1.42.4-patchset.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ee33d878baf0a327b092bd877c96dbf4
+_md5_=599e1c67b4d8005a2769d38172fb5c6b
diff --git a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1 b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
index ecd1728fcb12..ee47ccec5e50 100644
--- a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
+++ b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
@@ -8,7 +8,8 @@ IUSE=sound test test debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-3+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sound? ( dev-qt/qtmultimedia:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/snorenotify/0.7.0/src/snorenotify-0.7.0.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	ecm	af8e8a571d8b16ba226329b9abedeb1b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=caaf864d6c6e5d5017b33e9544ffd0a1
+_md5_=f1057c985709e69f9527c4420915cedd
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.2 b/metadata/md5-cache/x11-misc/rofi-1.5.2
index 30cfdb0ea39c..ebb2e460bbf5 100644
--- a/metadata/md5-cache/x11-misc/rofi-1.5.2
+++ b/metadata/md5-cache/x11-misc/rofi-1.5.2
@@ -8,7 +8,8 @@ IUSE=test windowmode
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davatorium/rofi/releases/download/1.5.2/rofi-1.5.2.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=afeea5d22531c0702e1871929a5237f9
+_md5_=387b47bbfb6ecad73195e3ad59285bc5
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.3 b/metadata/md5-cache/x11-misc/rofi-1.5.3
index d7caad6447ad..4ab20e536d4c 100644
--- a/metadata/md5-cache/x11-misc/rofi-1.5.3
+++ b/metadata/md5-cache/x11-misc/rofi-1.5.3
@@ -8,7 +8,8 @@ IUSE=test windowmode
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davatorium/rofi/releases/download/1.5.3/rofi-1.5.3.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=294a67c8d8730d2cb66448aeccd4c99c
+_md5_=0b7128c4aab6f646297af0174e9ea3f6
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.4 b/metadata/md5-cache/x11-misc/rofi-1.5.4
index a4a9ee3f2c67..adac4e03b500 100644
--- a/metadata/md5-cache/x11-misc/rofi-1.5.4
+++ b/metadata/md5-cache/x11-misc/rofi-1.5.4
@@ -8,7 +8,8 @@ IUSE=test windowmode
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davatorium/rofi/releases/download/1.5.4/rofi-1.5.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ba2ad28290c9a066ae21e8b525029c4b
+_md5_=f25c7524f8349fc93a60bac415fdc116
diff --git a/metadata/md5-cache/x11-misc/rofi-99999 b/metadata/md5-cache/x11-misc/rofi-99999
index 4feede12bcf8..6b8f214aee25 100644
--- a/metadata/md5-cache/x11-misc/rofi-99999
+++ b/metadata/md5-cache/x11-misc/rofi-99999
@@ -8,6 +8,7 @@ IUSE=test windowmode
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	6d22636df236df4cc8475f7b7668bdcd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b0cc6d30576b064dfecbfc2217f7cb30
+_md5_=8cc7c5620d0ace2c7c7d183f8a486a10
diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.1-r1 b/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
index 6b12f20fe509..f5afed21a7bd 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
+++ b/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
@@ -9,7 +9,8 @@ KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
 RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower )
 REQUIRED_USE=?? ( elogind systemd )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4f2c6d2c350fbfe6e6c9ccaab0aa2528
+_md5_=445210d42019893fb9e217f9980be8cd
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-1.10 b/metadata/md5-cache/x11-misc/shared-mime-info-1.10
index a4bbd72de71f..5000d382dc35 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-1.10
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-1.10
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hadess/shared-mime-info-1.10.tar.xz
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5816e8342d45efbad08ca2cfc51425da
+_md5_=ac14a140d1928502316a0ee2179a8d6a
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-1.10-r1 b/metadata/md5-cache/x11-misc/shared-mime-info-1.10-r1
index b2f0ce586c15..e766fc0acdf8 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-1.10-r1
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-1.10-r1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hadess/shared-mime-info-1.10.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a904cc7fc844b09e16f42149156e9791
+_md5_=387540e5c72fe947ed8d2703269e3a2a
diff --git a/metadata/md5-cache/x11-misc/zim-0.65 b/metadata/md5-cache/x11-misc/zim-0.65
index 03857e0395d9..b33803d44372 100644
--- a/metadata/md5-cache/x11-misc/zim-0.65
+++ b/metadata/md5-cache/x11-misc/zim-0.65
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86
 LICENSE=BSD GPL-2+
 RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://zim-wiki.org/downloads/zim-0.65.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	721d0faeb54c0c332aa593d384993b4c	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7cfbd7f3f01874daad10a52169e1535e
+_md5_=d117e0331b248bfc4557d6d8ceb1473f
diff --git a/metadata/md5-cache/x11-wm/i3-4.14 b/metadata/md5-cache/x11-wm/i3-4.14
index 6101c185d5ce..7b8e1879ea88 100644
--- a/metadata/md5-cache/x11-wm/i3-4.14
+++ b/metadata/md5-cache/x11-wm/i3-4.14
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm >=x11-libs/cairo-1.14.4[X,xcb] >=x11-libs/pango-1.30.0[X] dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 REQUIRED_USE=test? ( debug )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/i3/i3/archive/4.14.tar.gz -> i3-4.14.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=34a06df89276b6341534f99618584e9b
+_md5_=f663a1e26e3016af8ccf36e74c530a04
diff --git a/metadata/md5-cache/x11-wm/marco-1.22.1-r1 b/metadata/md5-cache/x11-wm/marco-1.22.1-r1
index 4ddf4dbbb979..a914b74f6d6f 100644
--- a/metadata/md5-cache/x11-wm/marco-1.22.1-r1
+++ b/metadata/md5-cache/x11-wm/marco-1.22.1-r1
@@ -7,7 +7,8 @@ IUSE=startup-notification test xinerama
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=gnome-base/libgtop-2:2= media-libs/libcanberra[gtk3] x11-libs/cairo >=x11-libs/pango-1.2[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXpresent x11-libs/libXrandr x11-libs/libXrender >=x11-libs/startup-notification-0.7 virtual/libintl xinerama? ( x11-libs/libXinerama ) !!x11-wm/mate-window-manager gnome-extra/zenity >=mate-base/mate-desktop-1.20.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.22/marco-1.22.1.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ebcf120b9f3165c219f73c9c86fda2c8
+_md5_=2a729c827a7d7268eaaa7ca4274c0a32
diff --git a/metadata/md5-cache/x11-wm/marco-1.22.2 b/metadata/md5-cache/x11-wm/marco-1.22.2
index 1eed705fd638..509c973c3582 100644
--- a/metadata/md5-cache/x11-wm/marco-1.22.2
+++ b/metadata/md5-cache/x11-wm/marco-1.22.2
@@ -7,7 +7,8 @@ IUSE=startup-notification test xinerama
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=gnome-base/libgtop-2:2= media-libs/libcanberra[gtk3] x11-libs/cairo >=x11-libs/pango-1.2[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXpresent x11-libs/libXrandr x11-libs/libXrender >=x11-libs/startup-notification-0.7 virtual/libintl xinerama? ( x11-libs/libXinerama ) !!x11-wm/mate-window-manager gnome-extra/zenity >=mate-base/mate-desktop-1.20.0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.22/marco-1.22.2.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e010b27fe3daf8405a9f827e3d3e73ce
+_md5_=f421ffb49c27348592494c8fb79144c0
diff --git a/metadata/md5-cache/x11-wm/muffin-3.6.0 b/metadata/md5-cache/x11-wm/muffin-3.6.0
index 50e0f0f3176d..b078510a1635 100644
--- a/metadata/md5-cache/x11-wm/muffin-3.6.0
+++ b/metadata/md5-cache/x11-wm/muffin-3.6.0
@@ -7,7 +7,8 @@ IUSE=+introspection test xinerama
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] >=media-libs/clutter-1.14.3:1.0=[X,introspection?] >=media-libs/cogl-1.13.3:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/libXcomposite-0.3 >=x11-libs/startup-notification-0.7:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) xinerama? ( x11-libs/libXinerama ) !x11-misc/expocity
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/3.6.0.tar.gz -> muffin-3.6.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c49fcc9fb4a6f6ce3ea7419f0c3e1ee
+_md5_=25b177aa71f2e3d87c69b2de48e899ea
diff --git a/metadata/md5-cache/x11-wm/muffin-3.8.2 b/metadata/md5-cache/x11-wm/muffin-3.8.2
index 78ce71e0e7da..2f9c8e4d7892 100644
--- a/metadata/md5-cache/x11-wm/muffin-3.8.2
+++ b/metadata/md5-cache/x11-wm/muffin-3.8.2
@@ -7,7 +7,8 @@ IUSE=+introspection test xinerama
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] >=media-libs/clutter-1.14.3:1.0=[X,introspection?] >=media-libs/cogl-1.13.3:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/libXcomposite-0.3 >=x11-libs/startup-notification-0.7:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) xinerama? ( x11-libs/libXinerama ) !x11-misc/expocity
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/3.8.2.tar.gz -> muffin-3.8.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4fa854d16fb80735cc0b8eb2ea1ebb3d
+_md5_=ddd60c0c542d42b2e77cff98ab980b0c
diff --git a/metadata/md5-cache/x11-wm/mutter-3.26.2-r1 b/metadata/md5-cache/x11-wm/mutter-3.26.2-r1
index ea3507981e17..3e09ce2705fc 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.26.2-r1
+++ b/metadata/md5-cache/x11-wm/mutter-3.26.2-r1
@@ -7,7 +7,8 @@ IUSE=debug gles2 input_devices_wacom +introspection test udev wayland test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] <gnome-base/gsettings-desktop-schemas-3.31 gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=dev-libs/libgudev-232:= ) wayland? ( >=dev-libs/libgudev-232:= >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.9 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= )
+RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/mutter/3.26/mutter-3.26.2.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-3.26.2-patchset.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f2ff41e0be30dbcab931d1314d512b9
+_md5_=c63a1a5c894f3778d0d8bc3aed99e202
diff --git a/metadata/md5-cache/x11-wm/mutter-3.30.2-r4 b/metadata/md5-cache/x11-wm/mutter-3.30.2-r4
index d9ee1bf6abab..94b57b2480bc 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.30.2-r4
+++ b/metadata/md5-cache/x11-wm/mutter-3.30.2-r4
@@ -8,7 +8,8 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] <gnome-base/gsettings-desktop-schemas-3.31 gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=dev-libs/libgudev-232:= ) screencast? ( >=media-video/pipewire-0.2.2:0/0.2 ) wayland? ( >=dev-libs/libgudev-232:= >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= )
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) )
+RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://gnome/sources/mutter/3.30/mutter-3.30.2.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-3.30.2-r4-patchset.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e3ef9f16cf3df4ba14ff1285ca31281
+_md5_=b7cc3b3c91ce3abcb86e90a62886a7d1
diff --git a/metadata/md5-cache/x11-wm/xpra-2.2.2-r1 b/metadata/md5-cache/x11-wm/xpra-2.2.2-r1
index ee811053b6b8..dc0a4e4ad00f 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.2.2-r1
+++ b/metadata/md5-cache/x11-wm/xpra-2.2.2-r1
@@ -8,7 +8,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
 RDEPEND=python_targets_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/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_avcodec2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) enc_ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.2.2:0= ) libav? ( media-video/libav:0= ) ) enc_x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) enc_x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/xmodmap cups? ( dev-python/pycups[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lz4? ( dev-python/lz4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) pillow? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) webcam? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_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(-)] virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.2.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfe9ac2ae1a299912e8d72bbf8c22754
+_md5_=5fe0e5c2303b84e4ba0c07d06f13b2ca
diff --git a/metadata/md5-cache/x11-wm/xpra-2.2.6-r2 b/metadata/md5-cache/x11-wm/xpra-2.2.6-r2
index 63a6b8b67cf4..fc62c121c0bb 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.2.6-r2
+++ b/metadata/md5-cache/x11-wm/xpra-2.2.6-r2
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
 RDEPEND=python_targets_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/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_avcodec2? ( !libav? ( >=media-video/ffmpeg-2:0=[x264,x265] ) libav? ( media-video/libav:0=[x264,x265] ) ) enc_ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.2.2:0= ) libav? ( media-video/libav:0= ) ) enc_x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] ) libav? ( media-video/libav:0=[x264] ) ) enc_x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0=[x264] ) libav? ( media-video/libav:0=[x264] ) ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/xmodmap cups? ( dev-python/pycups[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lz4? ( dev-python/lz4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) pillow? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) webcam? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_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(-)] virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.2.6.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1da9505adf20a22b9f6be392217f2207
+_md5_=2eeba8947f80864091b9ca5d2c928147
diff --git a/metadata/md5-cache/x11-wm/xpra-2.4.3 b/metadata/md5-cache/x11-wm/xpra-2.4.3
index 796f7b54e639..a8076034d08d 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.4.3
+++ b/metadata/md5-cache/x11-wm/xpra-2.4.3
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
 RDEPEND=python_targets_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/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_avcodec2? ( !libav? ( >=media-video/ffmpeg-2:0=[x264,x265] ) libav? ( media-video/libav:0=[x264,x265] ) ) enc_ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.2.2:0= ) libav? ( media-video/libav:0= ) ) enc_x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] ) libav? ( media-video/libav:0=[x264] ) ) enc_x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0=[x264] ) libav? ( media-video/libav:0=[x264] ) ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[jpeg?,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/xmodmap cups? ( dev-python/pycups[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lz4? ( dev-python/lz4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) webcam? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_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(-)] virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.4.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c879be787f1f44103b6ac175d8e0dd6
+_md5_=1b9e8b0b84df9ccb5859d80f449fbc0f