Don't use hardcoded gcc, bug #244150, drop doins for auth_conf.sub, it's nowhere to be found.

Package-Manager: portage-2.2.00.13755-prefix/cvs/Darwin powerpc

4 files changed, 16 insertions, 14 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index a2148262963a..8bb57a58cdae 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.134 2009/07/02 19:58:07 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.135 2009/07/02 20:16:06 grobian Exp $
+
+  02 Jul 2009; Fabian Groffen <grobian@gentoo.org> exim-4.69.ebuild,
+  exim-4.69-r2.ebuild:
+  Don't use hardcoded gcc, bug #244150, drop doins for auth_conf.sub, it's
+  nowhere to be found.
 
   02 Jul 2009; Fabian Groffen <grobian@gentoo.org> exim-4.69.ebuild,
   -exim-4.69-r1.ebuild, exim-4.69-r2.ebuild, metadata.xml:
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index ad804b365dfe..6ccd501a5369 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -14,7 +14,7 @@ AUX system_filter.exim 8120 RMD160 267545af6dd333e0e5f05e1d4d02a0e8ee638d45 SHA1
 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 10097 RMD160 7f1a35885315badf8debe39bfd89123894404e4c SHA1 9206bb6ee1261bc7c7da49efcb89a4d5a43722b2 SHA256 3f2b3efca35585e801a0075bf5193931e7c7ce21181cc5f09c398c9b73655f8d
-EBUILD exim-4.69.ebuild 9789 RMD160 8329d4eafb44dd3a55f7f00bfc56fd447e4a6837 SHA1 208db90867d78ce572599199c45fce890fe08479 SHA256 e025b934b35b80b90863d03e2188f9adbd44eb22c984f572e4458104ee221bf3
-MISC ChangeLog 30399 RMD160 2fd2f845767296880c963d08afc587f3c590c16b SHA1 dfc942d5bf85ddc7286d8f2fbeeda62c7368d6a5 SHA256 6c8faaf2ef8bd57b5bcfeedee4c5f7f8cc2fc4d04c49fb90b319a039095a8282
+EBUILD exim-4.69-r2.ebuild 10059 RMD160 e5930c85cc372a43dd7dac94a3aabdd1f0300af2 SHA1 c5ac39f3b75ed877aff33ecc819d5d87779cde2b SHA256 6159c8fa10f1244beee349e921d77bd1cb02584338013f216f8f3bc3ee751204
+EBUILD exim-4.69.ebuild 9707 RMD160 7d0775c192fd1bd51f2ba7642e944dde80e08ea8 SHA1 aa946a1ffe48dd02b77c9c707341116cab091a82 SHA256 d314869c014941a9b838bc4cae00814fbb0af61c04d7f71bc461f76de51c96d2
+MISC ChangeLog 30590 RMD160 875d8a93cdc308205d5587579ab61e29e40083cd SHA1 fdd5fd33c0558f27cf7a7a2ad34437c20e8dd108 SHA256 eb99b966f8722a7e304e9344a92d40222c501b05b62a3f0952ec5720c1e2ceda
 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-r2.ebuild
index 7d90f72455b5..bfded96d08b4 100644
--- a/mail-mta/exim/exim-4.69-r2.ebuild
+++ b/mail-mta/exim/exim-4.69-r2.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2009/07/02 19:58:07 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r2.ebuild,v 1.3 2009/07/02 20:16:06 grobian Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 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"
 
@@ -236,7 +236,8 @@ src_unpack() {
 }
 
 src_compile() {
-	make || die "make failed"
+	# build system not parallel-safe at all
+	emake -j1 CC="$(tc-getCC)" || die "make failed"
 }
 
 src_install () {
@@ -286,7 +287,6 @@ src_install () {
 		newins "${S}"/src/configure.default exim.conf.exiscan-acl
 	fi
 	doins "$WORKDIR"/system_filter.exim
-	doins "$DISTDIR"/auth_conf.sub
 	if use exiscan; then
 		newins "${S}"/src/configure.default exim.conf.exiscan
 		doins "${DISTDIR}"/exiscan.conf
@@ -315,7 +315,6 @@ src_install () {
 
 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 ]]
diff --git a/mail-mta/exim/exim-4.69.ebuild b/mail-mta/exim/exim-4.69.ebuild
index 7c044ddba994..9c7bb3a228c7 100644
--- a/mail-mta/exim/exim-4.69.ebuild
+++ b/mail-mta/exim/exim-4.69.ebuild
@@ -1,8 +1,8 @@
 # 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.ebuild,v 1.11 2009/07/02 19:58:07 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69.ebuild,v 1.12 2009/07/02 20:16:06 grobian Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbx mbox X exiscan nis syslog spf srs gnutls sqlite dovecot-sasl radius domainkeys"
 
@@ -231,7 +231,7 @@ src_unpack() {
 }
 
 src_compile() {
-	make || die "make failed"
+	emake -j1 CC="$(tc-getCC)" || die "make failed"
 }
 
 src_install () {
@@ -281,7 +281,6 @@ src_install () {
 		newins "${S}"/src/configure.default exim.conf.exiscan-acl
 	fi
 	doins "${FILESDIR}"/system_filter.exim
-	doins "${FILESDIR}"/auth_conf.sub
 	if use exiscan; then
 		newins "${S}"/src/configure.default exim.conf.exiscan
 		doins "${FILESDIR}"/exiscan.conf
@@ -304,7 +303,6 @@ src_install () {
 
 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 ]]