diff --git a/dev-perl/Mail-Builder-Simple/Mail-Builder-Simple-0.160.0-r1.ebuild b/dev-perl/Mail-Builder-Simple/Mail-Builder-Simple-0.160.0-r2.ebuild
similarity index 65%
rename from dev-perl/Mail-Builder-Simple/Mail-Builder-Simple-0.160.0-r1.ebuild
rename to dev-perl/Mail-Builder-Simple/Mail-Builder-Simple-0.160.0-r2.ebuild
index 0c9b26a211e7a..f9a5d9e690152 100644
--- a/dev-perl/Mail-Builder-Simple/Mail-Builder-Simple-0.160.0-r1.ebuild
+++ b/dev-perl/Mail-Builder-Simple/Mail-Builder-Simple-0.160.0-r2.ebuild
@@ -1,36 +1,31 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-MODULE_AUTHOR=TEDDY
-MODULE_VERSION=0.16
+DIST_AUTHOR=TEDDY
+DIST_VERSION=0.16
 inherit perl-module
 
 DESCRIPTION="Send UTF-8 HTML and text email using templates"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-COMMON="
-	>=dev-perl/Mail-Builder-1.12
+RDEPEND="
+	>=dev-perl/Mail-Builder-1.120.0
 	dev-perl/Email-Sender
 	dev-perl/Email-Valid
 	dev-perl/Config-Any
 	dev-perl/Config-General
 	dev-perl/Exception-Died
-	>=dev-perl/MailTools-2.04
+	>=dev-perl/MailTools-2.40.0
 	dev-perl/Email-MessageID
 	dev-perl/MIME-tools
 	dev-perl/HTML-Template
 	dev-perl/Template-Toolkit
 "
-DEPEND="${COMMON}
+BDEPEND="${RDEPEND}
 	test? (
 		dev-perl/Test-Pod
 		dev-perl/Test-Pod-Coverage
 	)"
-RDEPEND="${COMMON}"
-
-SRC_TEST="do"