--- /usr/portage/net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild	2005-04-09 15:05:50.000000000 +0200
+++ courier-imap-4.0.2.ebuild	2005-04-13 04:56:35.352201048 +0200
@@ -25,9 +25,7 @@
 	fam? ( virtual/fam )
 	selinux? ( sec-policy/selinux-courier-imap )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	dev-lang/perl
-	sys-process/procps
 	!mail-mta/courier"
 PROVIDE="virtual/imapd"
 
@@ -98,8 +96,7 @@
 	vpopmail_setup
 
 	local myconf
-	myconf="$(use_with ipv6)"
-
+	
 	# 19 Aug 2004; langthang@gentoo.org
 	# default to gdbm if both berkdb and gdbm present.
 	if use gdbm; then
@@ -142,13 +139,6 @@
 
 	use debug && myconf="${myconf} debug=true"
 
-	# fix for bug #27528
-	# they really should use a better way to detect redhat
-	myconf="${myconf} --without-redhat"
-
-	# bug #29879 - FAM support
-	myconf="${myconf} $(use_with fam)"
-
 	# bug #76592
 	# configure cache confuses the configure script. 
 	#local cachefile
@@ -176,15 +166,17 @@
 		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
 		--with-mailuser=mail \
 		--with-mailgroup=mail \
+		$(use_with ipv6) \
+		$(use_with fam) \
 		${myconf} || die "econf failed"
 
 	# change the pem file location..
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		-i.orig imap/imapd-ssl.dist || \
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		imap/imapd-ssl.dist || \
 		die "sed failed"
 
-	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		-i.orig imap/pop3d-ssl.dist || \
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		imap/pop3d-ssl.dist || \
 		die "sed failed"
 
 	emake || die "compile problem"
@@ -213,13 +205,9 @@
 		for type in "" "-ssl"; do
 			local file
 			file="${service}${type}.rc"
-			#cp ${file} ${file}.orig
-			#sed -e 's/Maildir/${MAILDIR}/' \
-			#    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-			#	${file}.orig > ${file}
-			sed -e 's/Maildir/${MAILDIR}/' \
-				-e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-				-i.orig ${file} || die "sed failed"
+			sed -i -e 's/Maildir/${MAILDIR}/' ${file} || die "sed failed"
+			sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
+				${file} || die "sed failed"
 		done
 	done
 
@@ -273,11 +261,10 @@
 	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/courier-imap/courierlogger || \
 			die "dosym failed"
 
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/${P}-courier-imapd.rc6 courier-imapd || die "newexe failed"
-		newexe ${FILESDIR}/${P}-courier-imapd-ssl.rc6 courier-imapd-ssl || die "newexe failed"
-		newexe ${FILESDIR}/${P}-courier-pop3d.rc6 courier-pop3d || die "newexe failed"
-		newexe ${FILESDIR}/${P}-courier-pop3d-ssl.rc6 courier-pop3d-ssl || die "newexe failed"
+	newinitd ${FILESDIR}/${P}-courier-imapd.rc6 courier-imapd || die "newinitd failed"
+	newinitd ${FILESDIR}/${P}-courier-imapd-ssl.rc6 courier-imapd-ssl || die "newinitd failed"
+	newinitd ${FILESDIR}/${P}-courier-pop3d.rc6 courier-pop3d || die "newinitd failed"
+	newinitd ${FILESDIR}/${P}-courier-pop3d-ssl.rc6 courier-pop3d-ssl || die "newinitd failed"
 
 	exeinto /usr/$(get_libdir)/courier-imap
 		newexe ${FILESDIR}/${P}-r1-gentoo-imapd.rc gentoo-imapd.rc || die "newexe failed"