--- /home/flame/devel/gentoo-x86/sys-apps/shadow/shadow-4.0.7-r1.ebuild	2005-03-22 16:17:47.000000000 +0100
+++ shadow-4.0.7-r1.ebuild	2005-05-20 12:45:35.859287920 +0200
@@ -17,7 +17,7 @@
 IUSE="pam selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
-	pam? ( >=sys-libs/pam-0.75-r4 )
+	pam? ( virtual/pam )
 	!pam? ( !sys-apps/pam-login )
 	skey? ( app-admin/skey )
 	selinux? ( sys-libs/libselinux )"
@@ -146,7 +146,7 @@
 		portageq has_version / '>=sys-libs/pam-0.78' && \
 			INSTALL_SYSTEM_PAMD="no"
 
-		for x in ${FILESDIR}/pam.d/*; do
+		for x in ${FILESDIR}/pam.d-include/*; do
 			case "${x##*/}" in
 				"login")
 					# We do no longer install this one, as its from
@@ -158,6 +158,13 @@
 					[ "${INSTALL_SYSTEM_PAMD}" = "yes" ] && [ -f ${x} ] && \
 						dopamd ${x}
 					;;
+				"su")
+					# Disable support for pam_env and pam_wheel on openpam
+					has_version sys-libs/pam && dopamd ${x}
+					;;
+				"su-openpam")
+					has_version sys-libs/openpam && newpamd ${x} su
+					;;
 				*)
 					[ -f ${x} ] && dopamd ${x}
 					;;
@@ -165,12 +172,12 @@
 		done
 		for x in chage chsh chfn chpasswd newusers \
 		         user{add,del,mod} group{add,del,mod} ; do
-			newpamd ${FILESDIR}/pam.d/shadow ${x}
+			newpamd ${FILESDIR}/pam.d-include/shadow ${x}
 		done
 
 		# Only add this one if needed.
 		if [ "${FORCE_SYSTEMAUTH_UPDATE}" = "yes" ]; then
-			newpamd ${FILESDIR}/pam.d/system-auth-1.1 system-auth.new || \
+			newpamd ${FILESDIR}/pam.d-include/system-auth-1.1 system-auth.new || \
 				die "Failed to install system-auth.new!"
 		fi