Grab includes and libs from the target ROOT, part of bug #266591

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

3 files changed, 21 insertions, 17 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 4c24f9d04fbf..858d6a1967db 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,9 @@
 # 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.140 2009/07/22 19:55:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.141 2009/07/24 07:21:22 grobian Exp $
+
+  24 Jul 2009; Fabian Groffen <grobian@gentoo.org> exim-4.69-r2.ebuild:
+  Grab includes and libs from the target ROOT, part of bug #266591
 
   22 Jul 2009; Fabian Groffen <grobian@gentoo.org> exim-4.69-r2.ebuild:
   Install pam.eclass generated /etc/pam.d/exim file, bug #261679
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 9910f2fbf4c5..75a69c12c2b4 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -13,7 +13,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 10093 RMD160 3a5cfcb520f793c3618458cd48dea248ba7b0427 SHA1 f34f4d8a956f030d1356527ecc6be59e493e58a2 SHA256 b902f05971d608862a72e69e683716add896ad0b17591402f3d2752d8d0c3cd8
+EBUILD exim-4.69-r2.ebuild 10149 RMD160 c4f6b53f73d6aa6c3bfed3ff4efd7c1a4a59ee30 SHA1 07729e4daff90ea01f116bbc4e4f6cea8b72e04c SHA256 9faa8ac51c35bc1664e0eafb29178fb2fe1f89b13972ea43f26919d66d1c202d
 EBUILD exim-4.69.ebuild 9906 RMD160 9b244dbbde9d454ea7be15bc46071e99943ec163 SHA1 ab0cfcfbe15b98681d79e077dab3195b0c1aadbe SHA256 6f5a4c76b40df44e203d86afbeba637b1a752349e0e3568cc08127fea204f915
-MISC ChangeLog 31533 RMD160 eb586333ca94e67a5052ab1718fe641174f1b851 SHA1 a995ffb756377c9e77af8f5686bd50239b9a2762 SHA256 7ae7889428e5d24850776674ece7b9acf854de654436d1c7c86f8bb0518f2d11
+MISC ChangeLog 31673 RMD160 3936a0f17b7348f1f70f7a0a15a3381b5c59dd07 SHA1 702fa80b3cf32ad11e248efa63712bfe6ad55f46 SHA256 c94c889c6ed61a10889844f257cee1d7fba95c509f066abc95dbdac04eb924e4
 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 8f850033192c..d74cd4dca87d 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.7 2009/07/22 19:55:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r2.ebuild,v 1.8 2009/07/24 07:21:22 grobian Exp $
 
-inherit eutils toolchain-funcs pam
+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"
 
@@ -153,7 +153,7 @@ src_unpack() {
 		sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Makefile
 	fi
 
-	if [ -n "$myconf" ] ; then
+	if [[ -n ${myconf} ]] ; then
 		echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile
 	fi
 
@@ -178,32 +178,32 @@ src_unpack() {
 		sed -i \
 			-e "s:# \(LOOKUP_LDAP=yes\):\1:" \
 			-e "s:# \(LDAP_LIB_TYPE=OPENLDAP2\):\1:" Local/Makefile
-		LOOKUP_INCLUDE="-I/usr/include/ldap"
-		LOOKUP_LIBS="-L/usr/lib -lldap -llber"
+		LOOKUP_INCLUDE="-I${ROOT}/usr/include/ldap"
+		LOOKUP_LIBS="-lldap -llber"
 	fi
 
 	if use mysql; then
 		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Local/Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/mysql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -L/usr/lib -lmysqlclient"
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${ROOT}/usr/include/mysql"
+		LOOKUP_LIBS="$LOOKUP_LIBS -lmysqlclient"
 	fi
 
 	if use postgres; then
 		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Local/Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/postgresql"
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${ROOT}/usr/include/postgresql"
 		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
 	fi
 	if use sqlite; then
 		sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Local/Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/sqlite"
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${ROOT}/usr/include/sqlite"
 		LOOKUP_LIBS="$LOOKUP_LIBS -lsqlite3"
 	fi
-	if [ -n "$LOOKUP_INCLUDE" ]; then
+	if [[ -n ${LOOKUP_INCLUDE} ]]; then
 		sed -i "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=$LOOKUP_INCLUDE:" \
 			Local/Makefile
 	fi
 
-	if [ -n "$LOOKUP_LIBS" ]; then
+	if [[ -n ${LOOKUP_LIBS} ]]; then
 		sed -i "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3:LOOKUP_LIBS=$LOOKUP_LIBS:" \
 			Local/Makefile
 	fi
@@ -227,8 +227,8 @@ src_unpack() {
 	if use domainkeys; then
 		echo "
 		EXPERIMENTAL_DOMAINKEYS=yes
-		CFLAGS  += -I/usr/include/libdomainkeys
-		LDFLAGS += -lcrypto -ldomainkeys -L/usr/lib/libdomainkeys" >> Local/Makefile
+		CFLAGS  += -I${ROOT}/usr/include/libdomainkeys
+		LDFLAGS += -lcrypto -L${ROOT}/usr/$(get_libdir)/libdomainkeys -ldomainkeys" >> Local/Makefile
 	fi
 
 # Use the "native" interface to the DBM library
@@ -264,7 +264,8 @@ src_install () {
 		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, so as not to interfere with mailx/nail."
+		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