--- /home/flame/devel/gentoo-x86/app-admin/usermin/usermin-1.130.ebuild	2005-04-24 01:10:34.000000000 +0200
+++ usermin-1.130.ebuild	2005-05-19 12:25:47.309771400 +0200
@@ -4,7 +4,7 @@
 
 IUSE="ssl"
 
-inherit eutils
+inherit eutils pam
 
 DESCRIPTION="a web-based user administration interface"
 HOMEPAGE="http://www.webmin.com/index6.html"
@@ -18,8 +18,8 @@
 
 RDEPEND="${DEPEND}
 	 sys-process/lsof
-	 >=sys-apps/sed-4
 	 dev-perl/Authen-PAM
+	 virtual/pam
 	 ssl? ( dev-perl/Net-SSLeay )"
 
 src_unpack() {
@@ -28,7 +28,7 @@
 	cd ${S}
 
 	# Point to the correct mysql location
-	sed -i "s:/usr/local/mysql:/usr:g" mysql/config
+	sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config
 
 	epatch ${FILESDIR}/${PN}-1.080-safestop.patch
 	epatch ${FILESDIR}/${PN}-1.100-setup-nocheck.patch
@@ -36,19 +36,17 @@
 
 src_install() {
 	# Change /usr/local/bin/perl references
-	find . -type f | xargs sed -i 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
+	find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
 
 	dodir /usr/libexec/usermin
-	cp -a * ${D}/usr/libexec/usermin
+	cp -pR * ${D}/usr/libexec/usermin
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init.d.usermin usermin
+	newinitd ${FILESDIR}/init.d.usermin usermin
 
-	insinto /etc/pam.d
-	newins ${FILESDIR}/${PN}.pam ${PN}
+	newpamd ${FILESDIR}/${PN}.pam-include ${PN}
 
 	# Fix ownership
-	chown -R root:root ${D}
+	chown -R root:wheel ${D}
 
 	dodir /etc/usermin
 	dodir /var/log/usermin
@@ -73,8 +71,8 @@
 	${D}/usr/libexec/usermin/setup.sh > ${T}/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
 
 	# Fixup the config files to use their real locations
-	sed -i 's:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:' ${D}/etc/usermin/miniserv.conf
-	find ${D}/etc/usermin -type f -exec sed -i "s:${D}:${ROOT}:g" {} \;
+	sed -i -e 's:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:' ${D}/etc/usermin/miniserv.conf
+	find ${D}/etc/usermin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
 
 	# Cleanup from the config script
 	rm -rf ${D}/var/log/usermin