*/*: [QA] Fix trivial cases of MissingTestRestrict

The result was achieved via the following pipeline:

    pkgcheck scan -c RestrictTestCheck -R FormatReporter \
      --format '{category}/{package}/{package}-{version}.ebuild' |
    xargs -n32 grep -L RESTRICT |
    xargs -n32 sed -i -e '/^IUSE=.*test/aRESTRICT="!test? ( test )"'

The resulting metadata was compared before and after the change.
Few Go ebuilds had to be fixed manually due to implicit RESTRICT=strip
added by the eclass.  Two ebuilds have to be fixed because of multiline
IUSE.

Suggested-by: Robin H. Johnson <robbat2@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/13942
Signed-off-by: Michał Górny <mgorny@gentoo.org>

51 files changed, 79 insertions, 28 deletions

diff --git a/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild b/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild
index 25c9f45d9906..57adc9d0fa2d 100644
--- a/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild b/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
index 693eadaacd95..7a241ff86f02 100644
--- a/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="app-admin/ansible[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/app-admin/conserver/conserver-8.2.3.ebuild b/app-admin/conserver/conserver-8.2.3.ebuild
index 8050e3f5da86..a6b7c099a51e 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD BSD-with-attribution"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
+RESTRICT="!test? ( test )"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )
 	freeipmi? ( sys-libs/freeipmi:= )
diff --git a/app-admin/conserver/conserver-8.2.4.ebuild b/app-admin/conserver/conserver-8.2.4.ebuild
index 7b500c68159f..018a794f081b 100644
--- a/app-admin/conserver/conserver-8.2.4.ebuild
+++ b/app-admin/conserver/conserver-8.2.4.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD BSD-with-attribution"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
+RESTRICT="!test? ( test )"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )
 	freeipmi? ( sys-libs/freeipmi:= )
diff --git a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
index 7ea2003bd5a4..1bfc6d258c62 100644
--- a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
+++ b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
@@ -12,6 +12,7 @@ HOMEPAGE="https://github.com/hashicorp/consul-replicate"
 LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
 SLOT="0"
 IUSE="test"
+RESTRICT+=" !test? ( test )"
 
 DEPEND=">=dev-lang/go-1.4:="
 RDEPEND=""
diff --git a/app-admin/diradm/diradm-2.9.7.1.ebuild b/app-admin/diradm/diradm-2.9.7.1.ebuild
index 582ceb15bc6d..6ce9e7a90d54 100644
--- a/app-admin/diradm/diradm-2.9.7.1.ebuild
+++ b/app-admin/diradm/diradm-2.9.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="automount irixpasswd samba test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( automount irixpasswd samba )"
 
 RDEPEND=">=net-nds/openldap-2.3
diff --git a/app-admin/entr/entr-4.3.ebuild b/app-admin/entr/entr-4.3.ebuild
index bfade6f4da8e..c2fb5be80105 100644
--- a/app-admin/entr/entr-4.3.ebuild
+++ b/app-admin/entr/entr-4.3.ebuild
@@ -13,6 +13,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 src_configure() {
 	sh configure || die
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
index ffe55dede38c..fb7dd4be7234 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
index 586f3c415df5..c7f2534ca0c2 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
index ffe55dede38c..fb7dd4be7234 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
index 586f3c415df5..c7f2534ca0c2 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
index ffe55dede38c..fb7dd4be7234 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
index 586f3c415df5..c7f2534ca0c2 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
index ffe55dede38c..fb7dd4be7234 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
index 586f3c415df5..c7f2534ca0c2 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
index ef2c730c8778..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
index ef2c730c8778..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild
index ef2c730c8778..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild
index bc589b56f9aa..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild
index bc589b56f9aa..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild
index 0bef08b2f3d8..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild
index 0bef08b2f3d8..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild
index e88453feb7e0..9a251dd782d8 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/gixy/gixy-0.1.20.ebuild b/app-admin/gixy/gixy-0.1.20.ebuild
index d56ff0091eef..a517bd4fad8e 100644
--- a/app-admin/gixy/gixy-0.1.20.ebuild
+++ b/app-admin/gixy/gixy-0.1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,6 +16,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
 	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
diff --git a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild b/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
index b6dd4fd2a017..914683fba0df 100644
--- a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
 IUSE="autotype browser debug keeshare +network test yubikey"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/argon2:=
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
index baa5af0d25de..4bc7be0358f1 100644
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ SLOT="0"
 LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
 KEYWORDS="amd64 x86"
 IUSE="libressl X +pinentry test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.2.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.2.ebuild
index d67ef36f961b..a8047a4f3661 100644
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.2.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.2.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
 KEYWORDS="~amd64 ~x86"
 IUSE="libressl X +pinentry test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
index d67ef36f961b..a8047a4f3661 100644
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
 KEYWORDS="~amd64 ~x86"
 IUSE="libressl X +pinentry test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
diff --git a/app-admin/lib_users/lib_users-0.13.ebuild b/app-admin/lib_users/lib_users-0.13.ebuild
index d4aca2e0ac61..3338ba112722 100644
--- a/app-admin/lib_users/lib_users-0.13.ebuild
+++ b/app-admin/lib_users/lib_users-0.13.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
index 0d5aba38b6d8..41466b8f3d98 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
@@ -20,6 +20,7 @@ LICENSE="GPL-2"
 SLOT="0/18"
 KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86"
 IUSE="command-not-found consolekit cron elogind entropy +introspection systemd test vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	^^ ( consolekit elogind systemd )
diff --git a/app-admin/pass-otp/pass-otp-1.2.0.ebuild b/app-admin/pass-otp/pass-otp-1.2.0.ebuild
index 07731fc77c09..607af255b6ce 100644
--- a/app-admin/pass-otp/pass-otp-1.2.0.ebuild
+++ b/app-admin/pass-otp/pass-otp-1.2.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="qrcode test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-tcltk/expect:* )"
 
diff --git a/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild
index 6de1b662f2ab..fe48f7cee17a 100644
--- a/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild
@@ -16,6 +16,7 @@ LICENSE="Artistic-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="libressl minimal test qr yubikey +xml xvkbd"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="xml? ( dev-libs/xerces-c )
 	qr? ( media-gfx/qrencode )
diff --git a/app-admin/pwman3/pwman3-0.10.0.ebuild b/app-admin/pwman3/pwman3-0.10.0.ebuild
index c63d60465f40..48418976fb21 100644
--- a/app-admin/pwman3/pwman3-0.10.0.ebuild
+++ b/app-admin/pwman3/pwman3-0.10.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="mongodb mysql postgres +sqlite test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
diff --git a/app-admin/pwman3/pwman3-0.9.11.ebuild b/app-admin/pwman3/pwman3-0.9.11.ebuild
index ba9a62305684..f83697e20877 100644
--- a/app-admin/pwman3/pwman3-0.9.11.ebuild
+++ b/app-admin/pwman3/pwman3-0.9.11.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="mongodb mysql postgres +sqlite test"
+RESTRICT="!test? ( test )"
 
 COMMON="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
diff --git a/app-admin/rcm/rcm-1.3.1.ebuild b/app-admin/rcm/rcm-1.3.1.ebuild
index e068009d9cee..b83724655d3c 100644
--- a/app-admin/rcm/rcm-1.3.1.ebuild
+++ b/app-admin/rcm/rcm-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-util/cram )"
 
diff --git a/app-admin/rcm/rcm-1.3.3.ebuild b/app-admin/rcm/rcm-1.3.3.ebuild
index e068009d9cee..b83724655d3c 100644
--- a/app-admin/rcm/rcm-1.3.3.ebuild
+++ b/app-admin/rcm/rcm-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-util/cram )"
 
diff --git a/app-admin/rex/rex-1.3.3.ebuild b/app-admin/rex/rex-1.3.3.ebuild
index 6081b372fac1..af414184c6c9 100644
--- a/app-admin/rex/rex-1.3.3.ebuild
+++ b/app-admin/rex/rex-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/DBI
diff --git a/app-admin/rex/rex-1.4.0-r1.ebuild b/app-admin/rex/rex-1.4.0-r1.ebuild
index 7fdb6b904a41..567130b86b33 100644
--- a/app-admin/rex/rex-1.4.0-r1.ebuild
+++ b/app-admin/rex/rex-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/DBI
diff --git a/app-admin/rex/rex-1.4.1.ebuild b/app-admin/rex/rex-1.4.1.ebuild
index acaf671c78bd..099a61a9bc6f 100644
--- a/app-admin/rex/rex-1.4.1.ebuild
+++ b/app-admin/rex/rex-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/DBI
diff --git a/app-admin/rex/rex-1.5.0.ebuild b/app-admin/rex/rex-1.5.0.ebuild
index d7c75b836fb6..4eedb99641f8 100644
--- a/app-admin/rex/rex-1.5.0.ebuild
+++ b/app-admin/rex/rex-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
 
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DZIL_DEPENDS="
 	dev-perl/Dist-Zilla
diff --git a/app-admin/rex/rex-1.6.0.ebuild b/app-admin/rex/rex-1.6.0.ebuild
index 5a34558d4efe..796195929d6d 100644
--- a/app-admin/rex/rex-1.6.0.ebuild
+++ b/app-admin/rex/rex-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
 
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DZIL_DEPENDS="
 	dev-perl/Dist-Zilla
diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild
index d7c75b836fb6..4eedb99641f8 100644
--- a/app-admin/rex/rex-9999.ebuild
+++ b/app-admin/rex/rex-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
 
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DZIL_DEPENDS="
 	dev-perl/Dist-Zilla
diff --git a/app-admin/setools/setools-4.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild
index 3e80e5e19f6b..ee786fe4b51a 100644
--- a/app-admin/setools/setools-4.2.1.ebuild
+++ b/app-admin/setools/setools-4.2.1.ebuild
@@ -20,6 +20,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="X test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
diff --git a/app-admin/stow/stow-2.2.2-r1.ebuild b/app-admin/stow/stow-2.2.2-r1.ebuild
index 6c38e26d6bd5..5fc1dffc1261 100644
--- a/app-admin/stow/stow-2.2.2-r1.ebuild
+++ b/app-admin/stow/stow-2.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-lang/perl
 	test? (
diff --git a/app-admin/stow/stow-2.3.1.ebuild b/app-admin/stow/stow-2.3.1.ebuild
index 834867c86051..8d897c6cd2fc 100644
--- a/app-admin/stow/stow-2.3.1.ebuild
+++ b/app-admin/stow/stow-2.3.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-lang/perl
 	test? (
diff --git a/app-admin/supernova/supernova-2.2.0.ebuild b/app-admin/supernova/supernova-2.2.0.ebuild
index b4c0f23b7752..098c36756865 100644
--- a/app-admin/supernova/supernova-2.2.0.ebuild
+++ b/app-admin/supernova/supernova-2.2.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/app-admin/supervisor/supervisor-3.1.4.ebuild b/app-admin/supervisor/supervisor-3.1.4.ebuild
index f7356ad7d5c8..7eb4c5a33259 100644
--- a/app-admin/supervisor/supervisor-3.1.4.ebuild
+++ b/app-admin/supervisor/supervisor-3.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,6 +19,7 @@ LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 # ALL versions of meld3 match to >=meld3-0.6.5
 RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
diff --git a/app-admin/supervisor/supervisor-3.3.5.ebuild b/app-admin/supervisor/supervisor-3.3.5.ebuild
index 4f3af393c545..3abc9b5b4158 100644
--- a/app-admin/supervisor/supervisor-3.3.5.ebuild
+++ b/app-admin/supervisor/supervisor-3.3.5.ebuild
@@ -19,6 +19,7 @@ LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/meld3[${PYTHON_USEDEP}]
diff --git a/app-admin/supervisor/supervisor-4.0.3.ebuild b/app-admin/supervisor/supervisor-4.0.3.ebuild
index 2437be46ea19..3490eb975f45 100644
--- a/app-admin/supervisor/supervisor-4.0.3.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.3.ebuild
@@ -19,6 +19,7 @@ LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/meld3-1.0.0[${PYTHON_USEDEP}]
diff --git a/app-admin/supervisor/supervisor-4.0.4.ebuild b/app-admin/supervisor/supervisor-4.0.4.ebuild
index bbb3b923c1de..4f4436c3ec1a 100644
--- a/app-admin/supervisor/supervisor-4.0.4.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.4.ebuild
@@ -19,6 +19,7 @@ LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/meld3-1.0.0[${PYTHON_USEDEP}]
diff --git a/app-admin/yadm/yadm-1.12.0.ebuild b/app-admin/yadm/yadm-1.12.0.ebuild
index e6b2381a71ff..55922bd1e757 100644
--- a/app-admin/yadm/yadm-1.12.0.ebuild
+++ b/app-admin/yadm/yadm-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="zsh-completion test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	test? (