diff --git a/dev-perl/Contextual-Return/Contextual-Return-0.4.14.ebuild b/dev-perl/Contextual-Return/Contextual-Return-0.4.14-r1.ebuild
similarity index 67%
rename from dev-perl/Contextual-Return/Contextual-Return-0.4.14.ebuild
rename to dev-perl/Contextual-Return/Contextual-Return-0.4.14-r1.ebuild
index 65fac2093b289..d8dee4d79e06a 100644
--- a/dev-perl/Contextual-Return/Contextual-Return-0.4.14.ebuild
+++ b/dev-perl/Contextual-Return/Contextual-Return-0.4.14-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=DCONWAY
 DIST_VERSION=0.004014
@@ -11,19 +11,14 @@ DESCRIPTION="Create context-sensitive return values"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/Want
 	virtual/perl-version
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? ( virtual/perl-Test-Simple )
 "
 
-src_test() {
-	perl_rm_files t/pod.t
-	perl-module_src_test
-}
+PERL_RM_FILES=( t/pod.t )