diff --git a/dev-perl/Email-Address/Email-Address-1.912.0.ebuild b/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild
similarity index 89%
rename from dev-perl/Email-Address/Email-Address-1.912.0.ebuild
rename to dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild
index de48410c8af1e..f479d8b7069a6 100644
--- a/dev-perl/Email-Address/Email-Address-1.912.0.ebuild
+++ b/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=RJBS
 DIST_VERSION=1.912
@@ -11,11 +11,9 @@ DESCRIPTION="RFC 2822 Address Parsing and Creation"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		virtual/perl-Encode