The big bug-fix (bug #82772), remove mailwrapper support. After long discussions, and many possibilities, it was finally decided to remove mailwrapper instead of fixing it, hopefully followed by some other approach soon. Added cross-compile patch, in preparation for bug #266591.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 42 insertions, 32 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 5487ac03a3df..bd91a7381947 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.142 2009/07/24 07:47:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.143 2009/07/24 08:54:11 grobian Exp $
+
+*exim-4.69-r3 (24 Jul 2009)
+
+  24 Jul 2009; Fabian Groffen <grobian@gentoo.org>
+  +files/exim-4.69-buildconfig-cross-compile.patch, -exim-4.69-r2.ebuild,
+  +exim-4.69-r3.ebuild:
+  The big bug-fix (bug #82772), remove mailwrapper support.  After long
+  discussions, and many possibilities, it was finally decided to remove
+  mailwrapper instead of fixing it, hopefully followed by some other approach
+  soon.  Added cross-compile patch, in preparation for bug #266591.
 
   24 Jul 2009; Fabian Groffen <grobian@gentoo.org> exim-4.69-r2.ebuild:
   Exim uses libiconv for header expansion, make this dependency explicit and
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index f07f963b6716..32e44d7bf710 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -3,6 +3,7 @@ AUX exim-4.14-tail.patch 446 RMD160 685e27ff995710f3b8d77d8785b04503170e7e27 SHA
 AUX exim-4.20-maildir.patch 478 RMD160 50c6a1dd6ae3f7bb1776696d3d0d7a161c351fce SHA1 c8287f7e44d93b0ca8761b8f7111974cfe1280a5 SHA256 2704c4db67bb7c58c2421656d942f533d1eedf1df187e76297ab72d2c2a2fb4c
 AUX exim-4.30-conf.patch 887 RMD160 4e50bdb4f3a9f061c7f4da763ad5e427b9cbea26 SHA1 cf7ecab19aba3b758d736c584b98fa4be2338050 SHA256 a33425492f246c6afe3be21e83e0dc20ecd5ea300a172d877f666d077648eedf
 AUX exim-4.43-r2-localscan_dlopen.patch 9236 RMD160 d33f7bcf72f947e8d1a3d917713630100c175491 SHA1 e4239a1bf0261f99491b4a29b26bbe8d9beffbd8 SHA256 3ec15d2dfdf251c70647c3def09711385f23983eceeecb6ec9d42b39f54b198d
+AUX exim-4.69-buildconfig-cross-compile.patch 512 RMD160 2fc29b3615488d9d7de9f84bcbc734965cc4a8da SHA1 7777fe3567936e3c27824165d534e8a26b47923d SHA256 35853f00332447f3bf6b33fc3ff0032a83aa56b1f960dcd88f7d253934c3e2d1
 AUX exim-4.69-r1.27021.patch 1447 RMD160 79269b955efee9c4bb99fc99cc026ec1b48f9712 SHA1 6c00bf72b31e51973efef2308f109ff90e077815 SHA256 dc81115be1324cf2d61ff2e2393462bd31aa63551a8b58d9dac39293bec058d5
 AUX exim-4.69-r1.boolean_redefine_protect.152706.patch 473 RMD160 f3a18c0d338d673a3bc216d19152c9c7c43e29d6 SHA1 ba08af4b635418ca4a81e6343da875f0b86daabd SHA256 85d1e7554dac8204e1d2e71a10d73a2172610190d74d005b152191e865e85108
 AUX exim.confd 62 RMD160 d8dcabf184ffb9066ad45c3e77cce1ec0392a143 SHA1 c56feda3c3193fad26852310da8ef24ef91f60f6 SHA256 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401
@@ -13,7 +14,7 @@ AUX pam.d-exim 101 RMD160 8ad4e0a05068ae20d5e8d401146456945d068322 SHA1 bdca3fb3
 DIST exim-4.69.tar.bz2 1658939 RMD160 ae97c807c63f858ba4a0ab402677225da9337d05 SHA1 321e238b6e6b32498110511ce72a911538305a39 SHA256 18e856cfdb682ba8e8ccb943ab538734d34d0ecefd63465ecc5430bc15915069
 DIST exiscan.conf 22113 RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 SHA1 74dc6e30f49402f5e6fefc280ea325d17f6af8c4 SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964
 DIST system_filter.exim.gz 3075 RMD160 47bcc6de402d896b73fd01d7f0d3c3ecbad9cf0b SHA1 384d138d8612f3a80b2b68f272b43cd69bc4411a SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437
-EBUILD exim-4.69-r2.ebuild 10345 RMD160 d987272a88f99d0e39c5aa478867e95e219f82f8 SHA1 78537462afe2b342623d5ac434059c2d6283711b SHA256 567f2ac8d7be3e98f05d5ece05d853eb39522343f9392280cffe8398a4567ed6
+EBUILD exim-4.69-r3.ebuild 9954 RMD160 b80177ee5eefbf74f32d620a6c8e28a32cd19307 SHA1 4cfdbc2417dbdd825b1909167370fbb773d65b1a SHA256 7e8706b251af067f94c42f9ffe084daa815fa6792c205ce2dbfe2de5740dc159
 EBUILD exim-4.69.ebuild 9906 RMD160 9b244dbbde9d454ea7be15bc46071e99943ec163 SHA1 ab0cfcfbe15b98681d79e077dab3195b0c1aadbe SHA256 6f5a4c76b40df44e203d86afbeba637b1a752349e0e3568cc08127fea204f915
-MISC ChangeLog 31869 RMD160 35c32214118a2be46c08474526696df9651bad90 SHA1 5a4c1dfafc6ba71232ac0924e15332757e81bdc3 SHA256 904a9d9c15fb271f3e4b33b2253d78680c0e250efbc73dd1e1f15a10bc40ec54
+MISC ChangeLog 32338 RMD160 cee4328ed3d1f83c4326cb56ebf6ae123279ee40 SHA1 1e86b2214871dd685dd84bff3b63089e75bca7dc SHA256 ff37685959d0dd4b8afe02f2076e52773766ab883bb058ba8affbf79633e3551
 MISC metadata.xml 1586 RMD160 c9b4546115c6db062a7fb9370039bb7e3b44ebd5 SHA1 933e217c55a4ee72b166119ab4f0dde986cc9825 SHA256 40a3ea558abbab45d65e7b79df9c56280be359e5bafca10195bd9d4b30e3c60d
diff --git a/mail-mta/exim/exim-4.69-r2.ebuild b/mail-mta/exim/exim-4.69-r3.ebuild
index 8c86a51623c6..ca7733e26faf 100644
--- a/mail-mta/exim/exim-4.69-r2.ebuild
+++ b/mail-mta/exim/exim-4.69-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r2.ebuild,v 1.9 2009/07/24 07:47:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r3.ebuild,v 1.1 2009/07/24 08:54:11 grobian Exp $
 
 inherit eutils toolchain-funcs multilib pam
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbx X exiscan nis syslog spf srs gnutls sqlite dovecot-sasl radius domainkeys maildir logrotate"
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X exiscan nis syslog spf srs gnutls sqlite dovecot-sasl radius domainkeys maildir logrotate"
 
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
 SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2
@@ -17,6 +17,7 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 PROVIDE="virtual/mta"
+
 DEPEND=">=sys-apps/sed-4.0.5
 	perl? ( sys-devel/libperl )
 	>=sys-libs/db-3.2
@@ -45,8 +46,7 @@ DEPEND=">=sys-apps/sed-4.0.5
 	"
 	# added X check for #57206
 RDEPEND="${DEPEND}
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	!mailwrapper? ( !virtual/mta )
+	!virtual/mta
 	>=net-mail/mailbase-0.00-r5
 	virtual/logger"
 
@@ -60,6 +60,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/exim-4.43-r2-localscan_dlopen.patch
 	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
 	epatch "${FILESDIR}"/exim-4.69-r1.boolean_redefine_protect.152706.patch
+	# for cross-compilation, but currently breaks normal compiles :/ #266591
+	#epatch "${FILESDIR}"/${P}-buildconfig-cross-compile.patch
 
 	if use maildir; then
 		einfo "Patching maildir support into exim.conf"
@@ -257,24 +259,13 @@ src_install () {
 	fperms 4755 /usr/sbin/exim
 
 	dodir /usr/bin /usr/sbin /usr/lib
-	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
-	else
-		dosym exim /usr/sbin/sendmail
-		dosym /usr/sbin/exim /usr/bin/mailq
-		dosym /usr/sbin/exim /usr/bin/newaliases
-		einfo "The Exim ebuild will no longer touch /usr/bin/mail, "
-		einfo "so as not to interfere with mailx/nail."
-		dosym exim /usr/sbin/rsmtp
-		dosym exim /usr/sbin/rmail
-	fi
+	dosym exim /usr/sbin/sendmail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym /usr/sbin/exim /usr/bin/mailq
+	dosym /usr/sbin/exim /usr/bin/newaliases
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
 
 	exeinto /usr/sbin
 	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
@@ -319,12 +310,4 @@ pkg_postinst() {
 	einfo "/etc/exim/system_filter.exim is a sample system_filter."
 	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
 }
diff --git a/mail-mta/exim/files/exim-4.69-buildconfig-cross-compile.patch b/mail-mta/exim/files/exim-4.69-buildconfig-cross-compile.patch
new file mode 100644
index 000000000000..929a17deaa64
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.69-buildconfig-cross-compile.patch
@@ -0,0 +1,16 @@
+http://thread.gmane.org/gmane.mail.exim.devel/3382
+http://bugs.gentoo.org/show_bug.cgi?id=266591
+
+--- OS/Makefile-Base
++++ OS/Makefile-Base
+@@ -114,8 +114,8 @@
+ 
+ # Targets for special-purpose configuration header builders
+ buildconfig: buildconfig.c
+-	@echo "$(CC) buildconfig.c"
+-	$(FE)$(CC) $(CFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS)
++	@echo "$(HOSTCC) buildconfig.c"
++	$(FE)$(HOSTCC) $(HOSTCFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS)
+ 
+ 
+ # Target for the exicyclog utility script