diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.2-r1.ebuild
similarity index 74%
rename from sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
rename to sys-apps/opentmpfiles/opentmpfiles-0.2-r1.ebuild
index dd790533d3ca1..84ffc0148d5d4 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit prefix
 
 if [[ ${PV} = 9999* ]]; then
@@ -20,33 +21,37 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="selinux"
 
-RDEPEND="!<sys-apps/openrc-0.23
+RDEPEND="
+	!<sys-apps/openrc-0.23
 	selinux? ( sec-policy/selinux-base-policy )"
 
 src_prepare() {
 	default
 	hprefixify tmpfiles
 }
+
 src_install() {
 	emake DESTDIR="${ED}" install
 	einstalldocs
-	cd openrc
+
+	cd openrc || die
+	local f
 	for f in opentmpfiles-dev opentmpfiles-setup; do
 		newconfd ${f}.confd ${f}
 		newinitd ${f}.initd ${f}
 	done
 }
 
-add_service() {
-	local initd=$1
-	local runlevel=$2
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-
 pkg_postinst() {
+	add_service() {
+		local initd=$1
+		local runlevel=$2
+
+		elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+		mkdir -p "${EROOT}"/etc/runlevels/${runlevel}
+		ln -snf /etc/init.d/${initd} "${EROOT}"/etc/runlevels/${runlevel}/${initd}
+	}
+
 	if [[ -z $REPLACING_VERSIONS ]]; then
 		add_service opentmpfiles-dev sysinit
 		add_service opentmpfiles-setup boot