*/*: [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>

89 files changed, 116 insertions, 27 deletions

diff --git a/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild b/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
index 09f6de5e8c09..b698fdb12382 100644
--- a/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
+++ b/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="Artistic-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/perl
 	dev-perl/YAML-Syck
diff --git a/dev-util/anjuta/anjuta-3.28.0-r1.ebuild b/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
index 379f5e06fda8..73fadd9f40f5 100644
--- a/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
+++ b/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
@@ -20,6 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 
 IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # FIXME: automagically uses libgda:6 if available
diff --git a/dev-util/autodia/autodia-2.140.0-r2.ebuild b/dev-util/autodia/autodia-2.140.0-r2.ebuild
index 0798ccd75ec4..4e8cb2652bf7 100644
--- a/dev-util/autodia/autodia-2.140.0-r2.ebuild
+++ b/dev-util/autodia/autodia-2.140.0-r2.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="graphviz test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/Template-Toolkit
diff --git a/dev-util/babeltrace/babeltrace-1.2.3.ebuild b/dev-util/babeltrace/babeltrace-1.2.3.ebuild
index 6fe8e9289c0e..265e9c26010f 100644
--- a/dev-util/babeltrace/babeltrace-1.2.3.ebuild
+++ b/dev-util/babeltrace/babeltrace-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/popt
diff --git a/dev-util/babeltrace/babeltrace-1.2.4.ebuild b/dev-util/babeltrace/babeltrace-1.2.4.ebuild
index 65412aef2de2..78d9753afaa2 100644
--- a/dev-util/babeltrace/babeltrace-1.2.4.ebuild
+++ b/dev-util/babeltrace/babeltrace-1.2.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
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/popt
diff --git a/dev-util/bam/bam-0.4.0-r1.ebuild b/dev-util/bam/bam-0.4.0-r1.ebuild
index 96a42af25130..78b8924a8951 100644
--- a/dev-util/bam/bam-0.4.0-r1.ebuild
+++ b/dev-util/bam/bam-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/lua:="
 DEPEND="${RDEPEND}
diff --git a/dev-util/bam/bam-0.5.1.ebuild b/dev-util/bam/bam-0.5.1.ebuild
index 7684f85a3ebf..28b19976824f 100644
--- a/dev-util/bam/bam-0.5.1.ebuild
+++ b/dev-util/bam/bam-0.5.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-lang/lua-5.3:="
 DEPEND="${RDEPEND}"
diff --git a/dev-util/bite/bite-9999.ebuild b/dev-util/bite/bite-9999.ebuild
index adddde77b9b9..c99164397694 100644
--- a/dev-util/bite/bite-9999.ebuild
+++ b/dev-util/bite/bite-9999.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://github.com/bite/bite"
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/requests-2[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
index cc2a6351b2d1..6db10ee36cbf 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.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"
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
index a1e2e8c473c2..6db10ee36cbf 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
index a1e2e8c473c2..6db10ee36cbf 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
index 7a88dd5d6952..48ee8398c5b7 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.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"
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
index cbf5ca68c8aa..203ef445478f 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
index cbf5ca68c8aa..203ef445478f 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
index bb90f9646953..7566aa4f8911 100644
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.12.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"
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/twisted-core[${PYTHON_USEDEP}]"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
index 1481782cc5d2..8f2ec7df2c10 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.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"
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
index 381cb9f5560e..8f2ec7df2c10 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
index 381cb9f5560e..8f2ec7df2c10 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
index 475028a231a8..0acf8ca32c4b 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.12.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"
@@ -24,6 +24,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
index cbff1cfe433b..294e04869974 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
@@ -24,6 +24,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
index cbff1cfe433b..294e04869974 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
@@ -24,6 +24,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index cbff1cfe433b..294e04869974 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -24,6 +24,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
index 4cabf641f704..293af6741ad5 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.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="5"
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
index 3c6698a632b3..bd88b982d62e 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
index 3c6698a632b3..bd88b982d62e 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
index 04389c8bb423..ca7e4b8583a9 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.12.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"
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
index f0f9c7e69d11..ca7e4b8583a9 100644
--- a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild b/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
index f0f9c7e69d11..ca7e4b8583a9 100644
--- a/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
index dc3c963ebc9c..f4f29f9274c4 100644
--- a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.12-r3.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"
@@ -18,6 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc examples irc mail manhole test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	dev-python/twisted-core[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild b/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
index 5164daeadabb..6f20fa2048de 100644
--- a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.12-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"
@@ -26,6 +26,7 @@ else
 fi
 
 IUSE="crypt examples irc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/buildbot-1.1.2.ebuild b/dev-util/buildbot/buildbot-1.1.2.ebuild
index a904b1708e96..11d1a6f2e89b 100644
--- a/dev-util/buildbot/buildbot-1.1.2.ebuild
+++ b/dev-util/buildbot/buildbot-1.1.2.ebuild
@@ -26,6 +26,7 @@ else
 fi
 
 IUSE="crypt docker examples irc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/buildbot-1.3.0.ebuild b/dev-util/buildbot/buildbot-1.3.0.ebuild
index ef67bc4187ac..4007eaa7c96e 100644
--- a/dev-util/buildbot/buildbot-1.3.0.ebuild
+++ b/dev-util/buildbot/buildbot-1.3.0.ebuild
@@ -26,6 +26,7 @@ else
 fi
 
 IUSE="crypt doc docker examples irc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index ef67bc4187ac..4007eaa7c96e 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -26,6 +26,7 @@ else
 fi
 
 IUSE="crypt doc docker examples irc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
diff --git a/dev-util/catkin/catkin-0.7.14.ebuild b/dev-util/catkin/catkin-0.7.14.ebuild
index cef4fa0eb0e8..a51330b83293 100644
--- a/dev-util/catkin/catkin-0.7.14.ebuild
+++ b/dev-util/catkin/catkin-0.7.14.ebuild
@@ -26,6 +26,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-util/catkin/catkin-0.7.17.ebuild b/dev-util/catkin/catkin-0.7.17.ebuild
index 84cbac41ee4e..92350f4085ab 100644
--- a/dev-util/catkin/catkin-0.7.17.ebuild
+++ b/dev-util/catkin/catkin-0.7.17.ebuild
@@ -26,6 +26,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 84cbac41ee4e..92350f4085ab 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -26,6 +26,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-util/cgdb/cgdb-0.6.8.ebuild b/dev-util/cgdb/cgdb-0.6.8.ebuild
index bc82ce66ea22..ddd55558fcbd 100644
--- a/dev-util/cgdb/cgdb-0.6.8.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.8.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
@@ -19,6 +19,7 @@ HOMEPAGE="http://cgdb.github.io/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 COMMONDEPEND="
 	sys-libs/ncurses:0=
diff --git a/dev-util/cgdb/cgdb-0.7.0-r1.ebuild b/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
index 846d5c8597bd..5a8f52e6edac 100644
--- a/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.0-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=7
@@ -19,6 +19,7 @@ HOMEPAGE="http://cgdb.github.io/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	sys-libs/ncurses:0=
diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
index 846d5c8597bd..5a8f52e6edac 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.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=7
@@ -19,6 +19,7 @@ HOMEPAGE="http://cgdb.github.io/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	sys-libs/ncurses:0=
diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
index c615e9c4e108..1e43d54469ec 100644
--- a/dev-util/cmake/cmake-3.14.6.ebuild
+++ b/dev-util/cmake/cmake-3.14.6.ebuild
@@ -18,6 +18,7 @@ SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 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"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
diff --git a/dev-util/cmake/cmake-3.14.7.ebuild b/dev-util/cmake/cmake-3.14.7.ebuild
index a257b9298462..98ca83720f9b 100644
--- a/dev-util/cmake/cmake-3.14.7.ebuild
+++ b/dev-util/cmake/cmake-3.14.7.ebuild
@@ -18,6 +18,7 @@ SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 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"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
diff --git a/dev-util/cmake/cmake-3.15.4.ebuild b/dev-util/cmake/cmake-3.15.4.ebuild
index 8379ddfb9330..d9456163e0ef 100644
--- a/dev-util/cmake/cmake-3.15.4.ebuild
+++ b/dev-util/cmake/cmake-3.15.4.ebuild
@@ -18,6 +18,7 @@ SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 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"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
diff --git a/dev-util/cmake/cmake-3.15.5.ebuild b/dev-util/cmake/cmake-3.15.5.ebuild
index 8379ddfb9330..d9456163e0ef 100644
--- a/dev-util/cmake/cmake-3.15.5.ebuild
+++ b/dev-util/cmake/cmake-3.15.5.ebuild
@@ -18,6 +18,7 @@ SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 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"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index 9fac25f3f3b1..eecc4f26cc8c 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	doc? ( app-doc/doxygen[dot] )
diff --git a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild b/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
index f1a0e34e7456..316e0d972785 100644
--- a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/future-0.15.2[${PYTHON_USEDEP}]
 	>=dev-python/binaryornot-0.2.0[${PYTHON_USEDEP}]
diff --git a/dev-util/d-feet/d-feet-0.3.14.ebuild b/dev-util/d-feet/d-feet-0.3.14.ebuild
index 5ec648d65c7c..08174ef46548 100644
--- a/dev-util/d-feet/d-feet-0.3.14.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.14.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 IUSE="test +X"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
index 67674b092f76..1ce3b43eece5 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # now optional:
diff --git a/dev-util/debhelper/debhelper-12.7.1.ebuild b/dev-util/debhelper/debhelper-12.7.1.ebuild
index e546013a4fd6..54960e54e86a 100644
--- a/dev-util/debhelper/debhelper-12.7.1.ebuild
+++ b/dev-util/debhelper/debhelper-12.7.1.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
 IUSE+=" ${DH_LANGS[@]/#/l10n_}"
 
diff --git a/dev-util/debhelper/debhelper-12.7.2.ebuild b/dev-util/debhelper/debhelper-12.7.2.ebuild
index e546013a4fd6..54960e54e86a 100644
--- a/dev-util/debhelper/debhelper-12.7.2.ebuild
+++ b/dev-util/debhelper/debhelper-12.7.2.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
 IUSE+=" ${DH_LANGS[@]/#/l10n_}"
 
diff --git a/dev-util/debhelper/debhelper-9.20160814.ebuild b/dev-util/debhelper/debhelper-9.20160814.ebuild
index 10f0449075ea..9da66079822e 100644
--- a/dev-util/debhelper/debhelper-9.20160814.ebuild
+++ b/dev-util/debhelper/debhelper-9.20160814.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=5
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
 IUSE+=" ${DH_LANGS[@]/#/l10n_}"
 
diff --git a/dev-util/distro-info/distro-info-0.14.ebuild b/dev-util/distro-info/distro-info-0.14.ebuild
index f8b1edfd3fd2..a360268d5bb6 100644
--- a/dev-util/distro-info/distro-info-0.14.ebuild
+++ b/dev-util/distro-info/distro-info-0.14.ebuild
@@ -16,6 +16,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="python test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/distro-info/distro-info-0.22.ebuild b/dev-util/distro-info/distro-info-0.22.ebuild
index 5eb8469e6df8..ab69bf260de2 100644
--- a/dev-util/distro-info/distro-info-0.22.ebuild
+++ b/dev-util/distro-info/distro-info-0.22.ebuild
@@ -16,6 +16,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="python test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/findbugs/findbugs-3.0.1.ebuild b/dev-util/findbugs/findbugs-3.0.1.ebuild
index 2498e2e3a9e4..68be97749c1e 100644
--- a/dev-util/findbugs/findbugs-3.0.1.ebuild
+++ b/dev-util/findbugs/findbugs-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-java/ant-core:0
 	dev-java/apple-java-extensions-bin:0
diff --git a/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild b/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
index 3c798d9af8bb..98dd96660821 100644
--- a/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
@@ -17,6 +17,7 @@ LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="clang +devhelp doc +git gtk-doc sysprof test vala webkit"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
diff --git a/dev-util/google-perftools/google-perftools-2.6.2.ebuild b/dev-util/google-perftools/google-perftools-2.6.2.ebuild
index f330adcf4e2b..7f9bcb09f7e5 100644
--- a/dev-util/google-perftools/google-perftools-2.6.2.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.6.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
@@ -19,6 +19,7 @@ SLOT="0/4"
 # AIX ppc/ppc64
 KEYWORDS="-* amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="largepages +debug minimal optimisememory test static-libs"
+RESTRICT="!test? ( test )"
 
 DEPEND="sys-libs/libunwind"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/google-perftools/google-perftools-2.7.ebuild b/dev-util/google-perftools/google-perftools-2.7.ebuild
index b28f8923d384..4dff6288dc5c 100644
--- a/dev-util/google-perftools/google-perftools-2.7.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7.ebuild
@@ -20,6 +20,7 @@ SLOT="0/4"
 KEYWORDS="-* ~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="largepages +debug minimal optimisememory test static-libs"
+RESTRICT="!test? ( test )"
 
 DEPEND="sys-libs/libunwind"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
index 5e4355d14c07..b8d2337eeb5e 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
@@ -18,6 +18,7 @@ fi
 
 LICENSE="GPL-2+"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
index 5e4355d14c07..b8d2337eeb5e 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
@@ -18,6 +18,7 @@ fi
 
 LICENSE="GPL-2+"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
index ce02ef31849f..70c9c537f182 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r1.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
@@ -25,6 +25,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
index 6a99f341fabb..ceebd590c4a5 100644
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r2.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
@@ -25,6 +25,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index feb5a1e88fdb..31a17b577b77 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.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
@@ -22,6 +22,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index 1d8742de69bf..46fc4f19ce4a 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -25,6 +25,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 3fd1ef3707b0..ae5bb6fa6fed 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -25,6 +25,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
index 24bf73e6f18d..c6c38eac90d8 100644
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ b/dev-util/patchutils/patchutils-0.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=5
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 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"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 # The testsuite makes use of gendiff(1) that comes from rpm, thus if
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
index 5f090fef4c4f..e008ce9b9d5c 100644
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.4.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 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"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # testsuite makes use of gendiff(1) that comes from rpm, thus if the user wants
 # to run tests, it should install that package as well.
diff --git a/dev-util/rosdep/rosdep-0.13.0.ebuild b/dev-util/rosdep/rosdep-0.13.0.ebuild
index 0c2319981163..eef6fa96cc88 100644
--- a/dev-util/rosdep/rosdep-0.13.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.13.0.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
diff --git a/dev-util/rosdep/rosdep-0.14.0.ebuild b/dev-util/rosdep/rosdep-0.14.0.ebuild
index 0c2319981163..eef6fa96cc88 100644
--- a/dev-util/rosdep/rosdep-0.14.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.14.0.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
diff --git a/dev-util/rosdep/rosdep-0.15.0.ebuild b/dev-util/rosdep/rosdep-0.15.0.ebuild
index 0c2319981163..eef6fa96cc88 100644
--- a/dev-util/rosdep/rosdep-0.15.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.15.0.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index 0c2319981163..eef6fa96cc88 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
diff --git a/dev-util/rosinstall/rosinstall-0.7.8.ebuild b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
index 02e024f0e55e..b1f832de970c 100644
--- a/dev-util/rosinstall/rosinstall-0.7.8.ebuild
+++ b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild
index 02e024f0e55e..b1f832de970c 100644
--- a/dev-util/rosinstall/rosinstall-9999.ebuild
+++ b/dev-util/rosinstall/rosinstall-9999.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
index 82bb67839bf8..7376d3a404f2 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index 82bb67839bf8..7376d3a404f2 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild b/dev-util/schroot/schroot-1.6.10-r4.ebuild
index 432388f071b4..3f08febeed95 100644
--- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r4.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="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	>=dev-libs/boost-1.42.0
diff --git a/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild
index 3f353a195e50..d10272a1dc5c 100644
--- a/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 [[ ${PV} != 9999 ]] &&
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	test? (
diff --git a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
index 0d59d5864047..5ad1196c7df7 100644
--- a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 [[ ${PV} != 9999 ]] &&
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	test? (
diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
index 0d59d5864047..5ad1196c7df7 100644
--- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 [[ ${PV} != 9999 ]] &&
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	test? (
diff --git a/dev-util/uncrustify/uncrustify-0.66.1.ebuild b/dev-util/uncrustify/uncrustify-0.66.1.ebuild
index 4f7ca1eaf4b8..fa3c210d52ae 100644
--- a/dev-util/uncrustify/uncrustify-0.66.1.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.66.1.ebuild
@@ -24,6 +24,7 @@ HOMEPAGE="http://uncrustify.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
diff --git a/dev-util/uncrustify/uncrustify-0.68.1.ebuild b/dev-util/uncrustify/uncrustify-0.68.1.ebuild
index c7801da62f74..85a400d29cc3 100644
--- a/dev-util/uncrustify/uncrustify-0.68.1.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.68.1.ebuild
@@ -24,6 +24,7 @@ HOMEPAGE="http://uncrustify.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
diff --git a/dev-util/uncrustify/uncrustify-0.69.0.ebuild b/dev-util/uncrustify/uncrustify-0.69.0.ebuild
index c7801da62f74..85a400d29cc3 100644
--- a/dev-util/uncrustify/uncrustify-0.69.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.69.0.ebuild
@@ -24,6 +24,7 @@ HOMEPAGE="http://uncrustify.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild
index c7801da62f74..85a400d29cc3 100644
--- a/dev-util/uncrustify/uncrustify-9999.ebuild
+++ b/dev-util/uncrustify/uncrustify-9999.ebuild
@@ -24,6 +24,7 @@ HOMEPAGE="http://uncrustify.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
diff --git a/dev-util/vint/vint-0.3.18.ebuild b/dev-util/vint/vint-0.3.18.ebuild
index 16ebfb587121..1b732f39b0a9 100644
--- a/dev-util/vint/vint-0.3.18.ebuild
+++ b/dev-util/vint/vint-0.3.18.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
diff --git a/dev-util/vint/vint-0.3.19.ebuild b/dev-util/vint/vint-0.3.19.ebuild
index f1b5aef200d5..aecd0e282e6b 100644
--- a/dev-util/vint/vint-0.3.19.ebuild
+++ b/dev-util/vint/vint-0.3.19.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index 4c583165574c..d21acc98e25b 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-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=5
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # The 'p' tool does support bitkeeper, but I'm against just dumping it in here
 # due to it's size.  I've explictly listed every other dependancy here due to
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 22f8dc34ed81..11a76e00ddf0 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.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
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # The 'p' tool does support bitkeeper, but I'm against just dumping it in here
 # due to it's size.  I've explictly listed every other dependancy here due to
diff --git a/dev-util/wstool/wstool-0.1.13.ebuild b/dev-util/wstool/wstool-0.1.13.ebuild
index 6019b9d53713..30a7bd56fa00 100644
--- a/dev-util/wstool/wstool-0.1.13.ebuild
+++ b/dev-util/wstool/wstool-0.1.13.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-util/wstool/wstool-0.1.17.ebuild b/dev-util/wstool/wstool-0.1.17.ebuild
index 694a26e5ca68..44cd350a809f 100644
--- a/dev-util/wstool/wstool-0.1.17.ebuild
+++ b/dev-util/wstool/wstool-0.1.17.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index 694a26e5ca68..44cd350a809f 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-9999.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-util/xdelta/xdelta-3.1.0.ebuild b/dev-util/xdelta/xdelta-3.1.0.ebuild
index a3ef6307073e..13da9efc6daa 100644
--- a/dev-util/xdelta/xdelta-3.1.0.ebuild
+++ b/dev-util/xdelta/xdelta-3.1.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
@@ -17,6 +17,7 @@ LICENSE="GPL-2"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-arch/xz-utils"
 DEPEND="${RDEPEND}