[patch] An updated diff (rmail being handled) against 4.50-r1

exim-4.50-r999.ebuild.diff (text/plain), 2.33 KB, created by Andrej Kacian (RETIRED) on 2005-07-04 16:24:06 UTC

--- exim-4.50-r1.ebuild	2005-07-03 13:55:16.000000000 +0200
+++ exim-4.50-r999.ebuild	2005-07-05 01:21:57.000000000 +0200
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.50-r1.ebuild,v 1.6 2005/07/02 19:06:09 kloeri Exp $
+# $Header: $
 
-inherit eutils
+inherit eutils mailer
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbox X exiscan nis syslog"
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbox X exiscan nis syslog"
 
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
 SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2"
@@ -12,7 +12,7 @@
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 
 PROVIDE="virtual/mta"
 DEPEND=">=sys-apps/sed-4.0.5
@@ -28,8 +28,6 @@
 	X? ( virtual/x11 )"
 	# added X check for #57206
 RDEPEND="${DEPEND}
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	!mailwrapper? ( !virtual/mta )
 	>=net-mail/mailbase-0.00-r5"
 
 src_unpack() {
@@ -193,23 +191,19 @@
 	fi
 	fperms 4755 /usr/sbin/exim
 
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosym ../sbin/exim /usr/bin/mailq
-	dosym ../sbin/exim /usr/bin/newaliases
+	dodir /usr/bin /usr/sbin
 	einfo "The Exim ebuild will no longer touch /usr/bin/mail, so as not to interfere with mailx/nail."
 	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	if \[ ! -e /usr/lib/sendmail \];
-	then
-		dosym /usr/sbin/sendmail /usr/lib/sendmail
-	fi
 
 	if use mailwrapper
 	then
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
+		mailer_install_conf
 	else
 		dosym exim /usr/sbin/sendmail
+		dosym /usr/sbin/sendmail /usr/lib/sendmail
+		dosym /usr/sbin/exim /usr/bin/mailq
+		dosym /usr/sbin/exim /usr/bin/newaliases
+		dosym /usr/sbin/exim /usr/bin/rmail
 	fi
 
 	exeinto /usr/sbin
@@ -256,11 +250,5 @@
 	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
+	mailer_pkg_postinst
 }