diff --git a/app-admin/sudo/sudo-1.9.3_p1.ebuild b/app-admin/sudo/sudo-1.9.3_p1-r1.ebuild
similarity index 97%
rename from app-admin/sudo/sudo-1.9.3_p1.ebuild
rename to app-admin/sudo/sudo-1.9.3_p1-r1.ebuild
index 32639cb05df9c..b85357b30b3cb 100644
--- a/app-admin/sudo/sudo-1.9.3_p1.ebuild
+++ b/app-admin/sudo/sudo-1.9.3_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -198,8 +198,10 @@ src_install() {
 		newins doc/schema.OpenLDAP sudo.schema
 	fi
 
-	pamd_mimic system-auth sudo auth account session
-	pamd_mimic system-auth sudo-i auth account session
+	if use pam; then
+		pamd_mimic system-auth sudo auth account session
+		pamd_mimic system-auth sudo-i auth account session
+	fi
 
 	keepdir /var/db/sudo/lectured
 	fperms 0700 /var/db/sudo/lectured
diff --git a/app-admin/sudo/sudo-1.9.4_p2.ebuild b/app-admin/sudo/sudo-1.9.4_p2-r1.ebuild
similarity index 97%
rename from app-admin/sudo/sudo-1.9.4_p2.ebuild
rename to app-admin/sudo/sudo-1.9.4_p2-r1.ebuild
index 84770ae1b432d..97dbed1a0209b 100644
--- a/app-admin/sudo/sudo-1.9.4_p2.ebuild
+++ b/app-admin/sudo/sudo-1.9.4_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -198,8 +198,10 @@ src_install() {
 		newins doc/schema.OpenLDAP sudo.schema
 	fi
 
-	pamd_mimic system-auth sudo auth account session
-	pamd_mimic system-auth sudo-i auth account session
+	if use pam; then
+		pamd_mimic system-auth sudo auth account session
+		pamd_mimic system-auth sudo-i auth account session
+	fi
 
 	keepdir /var/db/sudo/lectured
 	fperms 0700 /var/db/sudo/lectured
diff --git a/app-admin/sudo/sudo-1.9.5_p1.ebuild b/app-admin/sudo/sudo-1.9.5_p1-r1.ebuild
similarity index 98%
rename from app-admin/sudo/sudo-1.9.5_p1.ebuild
rename to app-admin/sudo/sudo-1.9.5_p1-r1.ebuild
index 53eee6aee832d..ae5daa1d0fd8d 100644
--- a/app-admin/sudo/sudo-1.9.5_p1.ebuild
+++ b/app-admin/sudo/sudo-1.9.5_p1-r1.ebuild
@@ -197,9 +197,10 @@ src_install() {
 		insinto /etc/openldap/schema
 		newins doc/schema.OpenLDAP sudo.schema
 	fi
-
-	pamd_mimic system-auth sudo auth account session
-	pamd_mimic system-auth sudo-i auth account session
+	if use pam; then
+		pamd_mimic system-auth sudo auth account session
+		pamd_mimic system-auth sudo-i auth account session
+	fi
 
 	keepdir /var/db/sudo/lectured
 	fperms 0700 /var/db/sudo/lectured
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 84770ae1b432d..97dbed1a0209b 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -198,8 +198,10 @@ src_install() {
 		newins doc/schema.OpenLDAP sudo.schema
 	fi
 
-	pamd_mimic system-auth sudo auth account session
-	pamd_mimic system-auth sudo-i auth account session
+	if use pam; then
+		pamd_mimic system-auth sudo auth account session
+		pamd_mimic system-auth sudo-i auth account session
+	fi
 
 	keepdir /var/db/sudo/lectured
 	fperms 0700 /var/db/sudo/lectured