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

56 files changed, 100 insertions, 44 deletions

diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index 48831af505d1..594e6c4cb1a1 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="3"
 KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 CDEPEND=">=dev-java/antlr-2.7.7-r7:0
 	dev-java/stringtemplate:0"
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index ffbb7faf52a2..330d0ce8f429 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="3.5"
 KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-java/stringtemplate:4"
 
diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
index 38d9b405e655..4949c2284c33 100644
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ b/dev-java/antlr/antlr-4.5.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="4"
 KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-java/antlr:3.5
 	dev-java/stringtemplate:4
diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
index ed1027b16e89..5c66074f5d0e 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="4"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-java/antlr:3.5
 	dev-java/stringtemplate:4
diff --git a/dev-java/bcel/bcel-6.0_rc3.ebuild b/dev-java/bcel/bcel-6.0_rc3.ebuild
index 5247d0b95179..ad7829dbc886 100644
--- a/dev-java/bcel/bcel-6.0_rc3.ebuild
+++ b/dev-java/bcel/bcel-6.0_rc3.ebuild
@@ -19,6 +19,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/commons-cli/commons-cli-1.3.1.ebuild b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
index a61fd6a54cde..514f882b5b6a 100644
--- a/dev-java/commons-cli/commons-cli-1.3.1.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.3.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=6
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.7"
 
diff --git a/dev-java/commons-cli/commons-cli-1.4.ebuild b/dev-java/commons-cli/commons-cli-1.4.ebuild
index 91a2f1e31ae3..997d2c07fd44 100644
--- a/dev-java/commons-cli/commons-cli-1.4.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.4.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 @@ LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.7"
 
diff --git a/dev-java/commons-codec/commons-codec-1.7.ebuild b/dev-java/commons-codec/commons-codec-1.7.ebuild
index 8a328da43bbc..02146ba0a65f 100644
--- a/dev-java/commons-codec/commons-codec-1.7.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.7.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
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index accce8f13e04..42ecb53bbf0a 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.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=5
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test-framework"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	test-framework? (
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
index 50ad9b9cf0a5..2c5e6d18421e 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r2.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="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	test? (
diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
index bd84b509220a..6a1080bb83c2 100644
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.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=6
@@ -16,6 +16,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=virtual/jdk-1.7
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
index 464bb54f6738..5e934a66a868 100644
--- a/dev-java/commons-io/commons-io-2.4.ebuild
+++ b/dev-java/commons-io/commons-io-2.4.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
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/dynalang/dynalang-0.4-r1.ebuild b/dev-java/dynalang/dynalang-0.4-r1.ebuild
index 2e6b4bd63b98..cb82aae1d8dd 100644
--- a/dev-java/dynalang/dynalang-0.4-r1.ebuild
+++ b/dev-java/dynalang/dynalang-0.4-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
@@ -19,6 +19,7 @@ SLOT="0"
 KEYWORDS="amd64"
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/fontbox/fontbox-1.8.11.ebuild b/dev-java/fontbox/fontbox-1.8.11.ebuild
index 182cd4100ed7..8177f7c9f41d 100644
--- a/dev-java/fontbox/fontbox-1.8.11.ebuild
+++ b/dev-java/fontbox/fontbox-1.8.11.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
@@ -17,6 +17,7 @@ LICENSE="Apache-2.0"
 SLOT="1.8"
 KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND=">=dev-java/commons-logging-1.1.1:0"
 
diff --git a/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild b/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
index 97a88563854a..9b6f57c388c4 100644
--- a/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
+++ b/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.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
@@ -21,6 +21,7 @@ LICENSE="Apache-2.0 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="~dev-java/freehep-graphicsbase-${PV}:${SLOT}"
 
diff --git a/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild b/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
index 75736b878100..75ea8d477b41 100644
--- a/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
+++ b/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.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="Apache-2.0 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-java/freehep-io:0
 	dev-java/junit:4"
diff --git a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
index 597c3c26fadd..e10420f55980 100644
--- a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
+++ b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.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="Apache-2.0 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
 	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
diff --git a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
index 3524b4c57c9e..290ad16874de 100644
--- a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
+++ b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.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="Apache-2.0 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
 	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
diff --git a/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
index 15b5b40186ca..9e6123138882 100644
--- a/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
+++ b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.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="Apache-2.0 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
 	~dev-java/freehep-graphicsbase-${PV}:${SLOT}
diff --git a/dev-java/freehep-io/freehep-io-2.2.2.ebuild b/dev-java/freehep-io/freehep-io-2.2.2.ebuild
index 1343d8707ff8..12bf7791effb 100644
--- a/dev-java/freehep-io/freehep-io-2.2.2.ebuild
+++ b/dev-java/freehep-io/freehep-io-2.2.2.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
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=virtual/jdk-1.7
 	test? ( dev-java/junit:4 )"
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
index b3b24a805173..0d2f1e083023 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.13.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
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-java/jdom:2"
 
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
index 497d77c4f528..8baacadd296d 100644
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
@@ -16,6 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 IUSE="+doc test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEP="
 	>=virtual/jdk-1.6.0
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild
index ea9864354038..5f6b0bc2fef8 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.7"
 
diff --git a/dev-java/jackson/jackson-2.9.10.ebuild b/dev-java/jackson/jackson-2.9.10.ebuild
index 20987cc01db5..b495fe7cf278 100644
--- a/dev-java/jackson/jackson-2.9.10.ebuild
+++ b/dev-java/jackson/jackson-2.9.10.ebuild
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.7"
 DEPEND=">=virtual/jdk-1.7
diff --git a/dev-java/jamon/jamon-2.81.ebuild b/dev-java/jamon/jamon-2.81.ebuild
index e506a3e9809c..32622058bb3a 100644
--- a/dev-java/jamon/jamon-2.81.ebuild
+++ b/dev-java/jamon/jamon-2.81.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"
@@ -18,6 +18,7 @@ LICENSE="BSD"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-java/log4j:0
 	java-virtuals/interceptor-api:0
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 5ab370d88996..f84cdf1be071 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
index 276db9dd4d51..49c60a72aeab 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.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"
@@ -19,6 +19,7 @@ LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=virtual/jdk-1.6
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
index 85728f172373..e5cff42377a1 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.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"
@@ -19,6 +19,7 @@ LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=virtual/jdk-1.6
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
index 85728f172373..e5cff42377a1 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.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"
@@ -19,6 +19,7 @@ LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=virtual/jdk-1.6
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index d93a466620b3..518050c95023 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.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
@@ -15,6 +15,7 @@ LICENSE="Apache-1.1"
 SLOT="2"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-java/xalan:0
diff --git a/dev-java/jettison/jettison-1.3.7.ebuild b/dev-java/jettison/jettison-1.3.7.ebuild
index c02d303d2230..ec0bb15ebbab 100644
--- a/dev-java/jettison/jettison-1.3.7.ebuild
+++ b/dev-java/jettison/jettison-1.3.7.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="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.6"
 
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 2990735567f4..21a082774ba9 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test vim-syntax"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-java/ant-core:0"
 
diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
index 2cf20f9d9991..e40695a585b8 100644
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ b/dev-java/jline/jline-2.12.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=5
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="2"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-java/jansi:0
diff --git a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
index 2eee39fbc808..3b819e8ef465 100644
--- a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
+++ b/dev-java/jrobin/jrobin-1.6.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="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/jts-core/jts-core-1.14.ebuild b/dev-java/jts-core/jts-core-1.14.ebuild
index b3559fafc3df..c69d022e3778 100644
--- a/dev-java/jts-core/jts-core-1.14.ebuild
+++ b/dev-java/jts-core/jts-core-1.14.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
@@ -18,6 +18,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=virtual/jdk-1.7
 	app-arch/unzip
diff --git a/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
index d92aacdc6272..adc3496b2da8 100644
--- a/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
+++ b/dev-java/metadata-extractor/metadata-extractor-2.8.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
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-java/xmpcore:0"
 
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
index 2e4b6c85aa19..6c11aa310f28 100644
--- a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
+++ b/dev-java/netty-buffer/netty-buffer-4.0.36.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="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="~dev-java/${MY_PN}-common-${PV}:0"
 
diff --git a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild b/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
index 3753a6e2ebd3..4488d079b4eb 100644
--- a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
+++ b/dev-java/netty-codec-http/netty-codec-http-4.0.36.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"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
 	~dev-java/${MY_PN}-codec-${PV}:0
diff --git a/dev-java/netty-codec/netty-codec-4.0.36.ebuild b/dev-java/netty-codec/netty-codec-4.0.36.ebuild
index 447b8bcc347b..0dfadb0d25fa 100644
--- a/dev-java/netty-codec/netty-codec-4.0.36.ebuild
+++ b/dev-java/netty-codec/netty-codec-4.0.36.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"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
 	~dev-java/${MY_PN}-common-${PV}:0
diff --git a/dev-java/netty-common/netty-common-4.0.36.ebuild b/dev-java/netty-common/netty-common-4.0.36.ebuild
index f401578160c6..8864cbf62128 100644
--- a/dev-java/netty-common/netty-common-4.0.36.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36.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"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-java/commons-logging:0
 	dev-java/javassist:3
diff --git a/dev-java/netty-handler/netty-handler-4.0.36.ebuild b/dev-java/netty-handler/netty-handler-4.0.36.ebuild
index d4ffae7bdcd0..91f939ecbf48 100644
--- a/dev-java/netty-handler/netty-handler-4.0.36.ebuild
+++ b/dev-java/netty-handler/netty-handler-4.0.36.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="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
 	~dev-java/${MY_PN}-codec-${PV}:0
diff --git a/dev-java/netty-transport/netty-transport-4.0.36.ebuild b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
index 46802012be81..f8fd19a650cb 100644
--- a/dev-java/netty-transport/netty-transport-4.0.36.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.36.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="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
 	~dev-java/${MY_PN}-common-${PV}:0"
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
index d25423ff91c0..23430992caad 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.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
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
index 87788627a484..e3f0c750c20c 100644
--- a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
+++ b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-java/log4j:0
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
index 3cc4d3beaafe..792d3f30f513 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.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
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-java/slf4j-api:0"
diff --git a/dev-java/snakeyaml/snakeyaml-1.16.ebuild b/dev-java/snakeyaml/snakeyaml-1.16.ebuild
index d0e257b8771e..84d47f987398 100644
--- a/dev-java/snakeyaml/snakeyaml-1.16.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.16.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"
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=virtual/jdk-1.6
 	test? (
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
index 22164ff6a6e3..b8733c26b50c 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.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"
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND=">=dev-java/antlr-2.7.7-r7:0"
 
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
index 7b0d10d82352..41fc1a76287a 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.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="BSD"
 SLOT="4"
 KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.6"
 
diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
index 6cd82ef7d554..279a08d9fcb8 100644
--- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-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
@@ -19,6 +19,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-java/tomcat-jstl-spec:0
diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
index acb770d95175..819873d5ddc8 100644
--- a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.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
@@ -19,6 +19,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-java/tomcat-jstl-impl:0
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
index 42d13cb63240..80abba919d84 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.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
@@ -18,6 +18,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-java/xalan:0
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
index 53f1365c8541..f765fd0acbcd 100644
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.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
@@ -19,6 +19,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="java-virtuals/servlet-api:3.0"
 
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild
index fb46a0bf4e2e..82f1d3aede1c 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/apr:1=
 	dev-libs/openssl:0=
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
index 0db3cc71d61c..176381b24148 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/apr:1=
 	dev-libs/openssl:0=
diff --git a/dev-java/treelayout/treelayout-1.0.2.ebuild b/dev-java/treelayout/treelayout-1.0.2.ebuild
index 5bd891235098..df9581ab4eb1 100644
--- a/dev-java/treelayout/treelayout-1.0.2.ebuild
+++ b/dev-java/treelayout/treelayout-1.0.2.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
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.6"
 
diff --git a/dev-java/wstx/wstx-3.2.9-r1.ebuild b/dev-java/wstx/wstx-3.2.9-r1.ebuild
index 0db6b6957de9..aab3ce385731 100644
--- a/dev-java/wstx/wstx-3.2.9-r1.ebuild
+++ b/dev-java/wstx/wstx-3.2.9-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"
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="3.2"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-java/sax:0