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

50 files changed, 100 insertions, 50 deletions

diff --git a/dev-ml/alcotest/alcotest-0.8.1.ebuild b/dev-ml/alcotest/alcotest-0.8.1.ebuild
index 40aa58ad9a07..b0d314768165 100644
--- a/dev-ml/alcotest/alcotest-0.8.1.ebuild
+++ b/dev-ml/alcotest/alcotest-0.8.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="5"
@@ -13,6 +13,7 @@ LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/fmt:=
diff --git a/dev-ml/alcotest/alcotest-0.8.2.ebuild b/dev-ml/alcotest/alcotest-0.8.2.ebuild
index 40aa58ad9a07..b0d314768165 100644
--- a/dev-ml/alcotest/alcotest-0.8.2.ebuild
+++ b/dev-ml/alcotest/alcotest-0.8.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="5"
@@ -13,6 +13,7 @@ LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/fmt:=
diff --git a/dev-ml/angstrom/angstrom-0.7.0.ebuild b/dev-ml/angstrom/angstrom-0.7.0.ebuild
index 29b53a837077..ac8753e0f442 100644
--- a/dev-ml/angstrom/angstrom-0.7.0.ebuild
+++ b/dev-ml/angstrom/angstrom-0.7.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="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-ml/result:="
 DEPEND="${RDEPEND}
diff --git a/dev-ml/atd/atd-1.12.0.ebuild b/dev-ml/atd/atd-1.12.0.ebuild
index 5095732e9dd9..437a438bc9a5 100644
--- a/dev-ml/atd/atd-1.12.0.ebuild
+++ b/dev-ml/atd/atd-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="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-lang/ocaml:=[ocamlopt?]
diff --git a/dev-ml/batteries/batteries-2.7.0.ebuild b/dev-ml/batteries/batteries-2.7.0.ebuild
index 7a5afefceaf9..fd324bf579fd 100644
--- a/dev-ml/batteries/batteries-2.7.0.ebuild
+++ b/dev-ml/batteries/batteries-2.7.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=5
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-ml/camomile:="
 DEPEND="${RDEPEND}
diff --git a/dev-ml/bos/bos-0.1.6.ebuild b/dev-ml/bos/bos-0.1.6.ebuild
index a3b7dc553e2e..7026a7718c5e 100644
--- a/dev-ml/bos/bos-0.1.6.ebuild
+++ b/dev-ml/bos/bos-0.1.6.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="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/ocaml:=
diff --git a/dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild b/dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild
index 4d060a2a99a2..4d22bddf3b63 100644
--- a/dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild
+++ b/dev-ml/capnp-ocaml/capnp-ocaml-3.0.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=5
@@ -13,6 +13,7 @@ LICENSE="BSD-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/core_kernel:=
diff --git a/dev-ml/capnp-ocaml/capnp-ocaml-3.1.0.ebuild b/dev-ml/capnp-ocaml/capnp-ocaml-3.1.0.ebuild
index 4d060a2a99a2..4d22bddf3b63 100644
--- a/dev-ml/capnp-ocaml/capnp-ocaml-3.1.0.ebuild
+++ b/dev-ml/capnp-ocaml/capnp-ocaml-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=5
@@ -13,6 +13,7 @@ LICENSE="BSD-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/core_kernel:=
diff --git a/dev-ml/cmdliner/cmdliner-1.0.0.ebuild b/dev-ml/cmdliner/cmdliner-1.0.0.ebuild
index 262192ca7b53..556ff298967c 100644
--- a/dev-ml/cmdliner/cmdliner-1.0.0.ebuild
+++ b/dev-ml/cmdliner/cmdliner-1.0.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=5
@@ -13,6 +13,7 @@ LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/ocaml-4:=[ocamlopt?]
diff --git a/dev-ml/cmdliner/cmdliner-1.0.1.ebuild b/dev-ml/cmdliner/cmdliner-1.0.1.ebuild
index 262192ca7b53..556ff298967c 100644
--- a/dev-ml/cmdliner/cmdliner-1.0.1.ebuild
+++ b/dev-ml/cmdliner/cmdliner-1.0.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=5
@@ -13,6 +13,7 @@ LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/ocaml-4:=[ocamlopt?]
diff --git a/dev-ml/cmdliner/cmdliner-1.0.2.ebuild b/dev-ml/cmdliner/cmdliner-1.0.2.ebuild
index 262192ca7b53..556ff298967c 100644
--- a/dev-ml/cmdliner/cmdliner-1.0.2.ebuild
+++ b/dev-ml/cmdliner/cmdliner-1.0.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=5
@@ -13,6 +13,7 @@ LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/ocaml-4:=[ocamlopt?]
diff --git a/dev-ml/cudf/cudf-0.8-r1.ebuild b/dev-ml/cudf/cudf-0.8-r1.ebuild
index 4798b763acc6..3d7e202217bc 100644
--- a/dev-ml/cudf/cudf-0.8-r1.ebuild
+++ b/dev-ml/cudf/cudf-0.8-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=5
@@ -13,6 +13,7 @@ LICENSE="LGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/ocaml-3.12:=[ocamlopt?]
diff --git a/dev-ml/fmt/fmt-0.8.4.ebuild b/dev-ml/fmt/fmt-0.8.4.ebuild
index 19b27b4284d0..e8a084aad4f5 100644
--- a/dev-ml/fmt/fmt-0.8.4.ebuild
+++ b/dev-ml/fmt/fmt-0.8.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="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-ml/result:=[ocamlopt]
 	dev-lang/ocaml:=[ocamlopt]
diff --git a/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild b/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild
index 694f13126426..7b461efb3ec0 100644
--- a/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild
+++ b/dev-ml/gsl-ocaml/gsl-ocaml-1.19.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=5
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=sci-libs/gsl-1.19"
 RDEPEND="${DEPEND}
diff --git a/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild b/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild
index 73b64735ff87..895e7108354d 100644
--- a/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild
+++ b/dev-ml/jbuilder/jbuilder-1.0_beta14.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="Apache-2.0"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
index b7f93be62778..af4b80e9a5d9 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.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=5
@@ -23,6 +23,7 @@ fi
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 IUSE="+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/ocaml-3.12:=[ocamlopt?]
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild
index 9fe8dff84edd..827937bd0f40 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-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=5
@@ -21,6 +21,7 @@ fi
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 IUSE="+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/ocaml-3.12:=[ocamlopt?]
diff --git a/dev-ml/logs/logs-0.6.2.ebuild b/dev-ml/logs/logs-0.6.2.ebuild
index 65f024a9d4b1..6cead1cfd73a 100644
--- a/dev-ml/logs/logs-0.6.2.ebuild
+++ b/dev-ml/logs/logs-0.6.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="5"
@@ -13,6 +13,7 @@ LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="javascript +fmt cli +lwt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/result:=[ocamlopt]
diff --git a/dev-ml/markup/markup-0.7.5.ebuild b/dev-ml/markup/markup-0.7.5.ebuild
index 66c1698789fe..68e867c0943d 100644
--- a/dev-ml/markup/markup-0.7.5.ebuild
+++ b/dev-ml/markup/markup-0.7.5.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="BSD"
 SLOT="0/${PV}p1"
 KEYWORDS="~amd64"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-lang/ocaml:=[ocamlopt]
diff --git a/dev-ml/mtime/mtime-1.1.0.ebuild b/dev-ml/mtime/mtime-1.1.0.ebuild
index 1c5185f3abd3..a8aa8f99358c 100644
--- a/dev-ml/mtime/mtime-1.1.0.ebuild
+++ b/dev-ml/mtime/mtime-1.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="5"
@@ -13,6 +13,7 @@ LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="javascript test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/ocaml:=[ocamlopt]
 	javascript? ( dev-ml/js_of_ocaml:= )
diff --git a/dev-ml/ocaml-base64/ocaml-base64-2.2.0.ebuild b/dev-ml/ocaml-base64/ocaml-base64-2.2.0.ebuild
index 35d4f2abf2bf..271b24dd32e1 100644
--- a/dev-ml/ocaml-base64/ocaml-base64-2.2.0.ebuild
+++ b/dev-ml/ocaml-base64/ocaml-base64-2.2.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="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-ml/ocaml-containers/ocaml-containers-1.3.ebuild b/dev-ml/ocaml-containers/ocaml-containers-1.3.ebuild
index 33e8871a4f73..e043043cc2a5 100644
--- a/dev-ml/ocaml-containers/ocaml-containers-1.3.ebuild
+++ b/dev-ml/ocaml-containers/ocaml-containers-1.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
@@ -16,6 +16,7 @@ LICENSE="BSD-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/result:=
diff --git a/dev-ml/ocaml-containers/ocaml-containers-1.4.ebuild b/dev-ml/ocaml-containers/ocaml-containers-1.4.ebuild
index 33e8871a4f73..e043043cc2a5 100644
--- a/dev-ml/ocaml-containers/ocaml-containers-1.4.ebuild
+++ b/dev-ml/ocaml-containers/ocaml-containers-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
@@ -16,6 +16,7 @@ LICENSE="BSD-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/result:=
diff --git a/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild b/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild
index 1b42677acb65..f766d6e0c4f8 100644
--- a/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild
+++ b/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.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=5
@@ -13,6 +13,7 @@ LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="async +lwt +ppx test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	async? (
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild
index b7c40ad550cd..c2e1edb4209f 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.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=5
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.02:=[ocamlopt]
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild
index a46755cc0678..7429fab28811 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.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="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.02:=[ocamlopt]
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
index f2c3d64f44a8..ea192196f12a 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.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="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.02:=[ocamlopt]
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
index f2c3d64f44a8..ea192196f12a 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.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=5
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/ocaml-4.02:=[ocamlopt]
diff --git a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild
index 562ef548b9a1..2e502161f235 100644
--- a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild
+++ b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.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=5
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-ml/result:=
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild
index 00eeb198ef8d..73386d528fc7 100644
--- a/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.0.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=5
@@ -6,6 +6,7 @@ EAPI=5
 inherit findlib eutils
 
 IUSE="doc +ocamlopt test"
+RESTRICT="!test? ( test )"
 
 DESCRIPTION="OCaml bindings for expat"
 SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild
index 00eeb198ef8d..73386d528fc7 100644
--- a/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.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=5
@@ -6,6 +6,7 @@ EAPI=5
 inherit findlib eutils
 
 IUSE="doc +ocamlopt test"
+RESTRICT="!test? ( test )"
 
 DESCRIPTION="OCaml bindings for expat"
 SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild b/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild
index 7fe5e81a48f6..7f9cc015a09e 100644
--- a/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild
+++ b/dev-ml/ocaml-expect/ocaml-expect-0.0.5.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
@@ -16,6 +16,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/batteries:=
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild
index bfa850f00bed..af60301a3390 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-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=5
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-lang/ocaml-3.12.1:=
 	>=dev-ml/ocaml-fileutils-0.4.0:=
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild
index 90649dc623b9..c6b4aeea4409 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.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="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-lang/ocaml-3.12.1:=
 	>=dev-ml/ocaml-fileutils-0.4.0:=
diff --git a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild
index c4a103f9a450..21a35d68fc5c 100644
--- a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild
+++ b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.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=5
@@ -13,6 +13,7 @@ LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-ml/sexplib:=
 	dev-ml/ppx_sexp_conv:=
diff --git a/dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild b/dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild
index c8cec900da50..0c28d5c302a8 100644
--- a/dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild
+++ b/dev-ml/ocaml-re/ocaml-re-1.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=5
@@ -16,6 +16,7 @@ LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-lang/ocaml-4.02:="
 DEPEND="${RDEPEND}
diff --git a/dev-ml/ocaml-redis-lwt/ocaml-redis-lwt-0.3.5.ebuild b/dev-ml/ocaml-redis-lwt/ocaml-redis-lwt-0.3.5.ebuild
index a5e2d5969dd5..0899ded476bc 100644
--- a/dev-ml/ocaml-redis-lwt/ocaml-redis-lwt-0.3.5.ebuild
+++ b/dev-ml/ocaml-redis-lwt/ocaml-redis-lwt-0.3.5.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="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/ocaml:=
diff --git a/dev-ml/ocaml-redis-sync/ocaml-redis-sync-0.3.5.ebuild b/dev-ml/ocaml-redis-sync/ocaml-redis-sync-0.3.5.ebuild
index 54105358e9cd..5533c2e22e5a 100644
--- a/dev-ml/ocaml-redis-sync/ocaml-redis-sync-0.3.5.ebuild
+++ b/dev-ml/ocaml-redis-sync/ocaml-redis-sync-0.3.5.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="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/ocaml:=
diff --git a/dev-ml/ocaml-redis/ocaml-redis-0.3.5.ebuild b/dev-ml/ocaml-redis/ocaml-redis-0.3.5.ebuild
index 97c63e8a8de4..a897ea5da073 100644
--- a/dev-ml/ocaml-redis/ocaml-redis-0.3.5.ebuild
+++ b/dev-ml/ocaml-redis/ocaml-redis-0.3.5.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="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/ocaml:=
diff --git a/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild b/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild
index 53b7fbd0612d..bfa2f6bcf832 100644
--- a/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild
+++ b/dev-ml/ocaml-uri/ocaml-uri-1.9.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="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-ml/ocaml-re:=
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
index a3a99856903d..4556ac43c4db 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.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=5
@@ -11,6 +11,7 @@ LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
 RDEPEND="${DEPEND}
diff --git a/dev-ml/onanomsg/onanomsg-1.0-r2.ebuild b/dev-ml/onanomsg/onanomsg-1.0-r2.ebuild
index d67ffaa0a2ce..24450b0c599c 100644
--- a/dev-ml/onanomsg/onanomsg-1.0-r2.ebuild
+++ b/dev-ml/onanomsg/onanomsg-1.0-r2.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="WTFPL-2"
 SLOT="0/${PV}-bigstring"
 KEYWORDS="~amd64"
 IUSE="+lwt +ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/nanomsg:=
diff --git a/dev-ml/opam/opam-1.3.1-r1.ebuild b/dev-ml/opam/opam-1.3.1-r1.ebuild
index 57dd504dc707..a9416d6d2d17 100644
--- a/dev-ml/opam/opam-1.3.1-r1.ebuild
+++ b/dev-ml/opam/opam-1.3.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=5
@@ -11,6 +11,7 @@ LICENSE="LGPL-3-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/ocaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild
index 0849fdefe983..5b315e69bee2 100644
--- a/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild
+++ b/dev-ml/ppx_deriving/ppx_deriving-4.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="5"
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc +ocamlopt test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-ml/ppx_tools:=
diff --git a/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.0.ebuild b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.0.ebuild
index 07d29ef08c77..efadbf89ec58 100644
--- a/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.0.ebuild
+++ b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.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=5
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-lang/ocaml:=[ocamlopt?]
diff --git a/dev-ml/ppx_import/ppx_import-1.2.ebuild b/dev-ml/ppx_import/ppx_import-1.2.ebuild
index efecbd3f7200..56b86b5efe91 100644
--- a/dev-ml/ppx_import/ppx_import-1.2.ebuild
+++ b/dev-ml/ppx_import/ppx_import-1.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=5
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-lang/ocaml:=[ocamlopt?]
diff --git a/dev-ml/react/react-1.2.1.ebuild b/dev-ml/react/react-1.2.1.ebuild
index e20330615472..2e75b7cd1f04 100644
--- a/dev-ml/react/react-1.2.1.ebuild
+++ b/dev-ml/react/react-1.2.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="5"
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-ml/stringext/stringext-1.5.0.ebuild b/dev-ml/stringext/stringext-1.5.0.ebuild
index 698b8f42876c..a98b729ce2b0 100644
--- a/dev-ml/stringext/stringext-1.5.0.ebuild
+++ b/dev-ml/stringext/stringext-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
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-ml/uutf/uutf-1.0.1.ebuild b/dev-ml/uutf/uutf-1.0.1.ebuild
index 3e6636aa1def..914e9dfb486c 100644
--- a/dev-ml/uutf/uutf-1.0.1.ebuild
+++ b/dev-ml/uutf/uutf-1.0.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="5"
@@ -13,6 +13,7 @@ LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="doc utftrip +ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
 	dev-ml/uchar:=
diff --git a/dev-ml/xmlm/xmlm-1.3.0.ebuild b/dev-ml/xmlm/xmlm-1.3.0.ebuild
index f01035cc90c4..a479aa210a1e 100644
--- a/dev-ml/xmlm/xmlm-1.3.0.ebuild
+++ b/dev-ml/xmlm/xmlm-1.3.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=5
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}