--- /usr/portage/net-mail/popa3d/popa3d-0.6.4.1-r1.ebuild	Thu Feb 24 17:26:15 2005
+++ net-mail/popa3d/popa3d-0.6.4.1-r1.ebuild	Thu Mar 10 11:16:43 2005
@@ -85,28 +85,24 @@
 	ewarn
 	echo
 	epause 5
-
-	if ! grep -q ^popa3d: /etc/group ; then
-		groupadd popa3d || die "Failed to add group: popa3d"
-	fi
-
-	if ! grep -q ^popa3d: /etc/passwd ; then
-		useradd -g popa3d -d /dev/null -s /dev/null popa3d || die "Failed to add user: popa3d"
-	fi
+	
+	enewgroup popa3d
+	enewuser popa3d -1 /bin/false /nonexistent popa3d
 }
 
 src_unpack() {
-	unpack ${P}.tar.gz
+	unpack ${A}
+	cd ${S}
+	epatch ${DISTDIR}/popa3d-0.6.3-vname-2.diff
+
+	use maildir && epatch ${DISTDIR}/popa3d-0.5.9-maildir-2.diff
 }
 
 src_compile() {
 	cd ${S}
 
-	epatch ${DISTDIR}/popa3d-0.6.3-vname-2.diff
-
 	if use maildir ; then
 		einfo "Mailbox format is: MAILDIR."
-		epatch ${DISTDIR}/popa3d-0.5.9-maildir-2.diff
 		if [ "${POPA3D_HOME_MAILBOX}" = "" ] ; then
 			POPA3D_HOME_MAILBOX=".maildir"
 		fi