fix bug #38606.

3 files changed, 27 insertions, 19 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index ea427dbb4490..dd1d59668984 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/courier-imap
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.51 2004/01/08 12:20:13 weeve Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.52 2004/01/19 01:10:18 robbat2 Exp $
+
+  18 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild:
+  fix bug #38606.
 
   08 Jan 2004; Jason Wever <weeve@gentoo.org> courier-imap-2.1.2-r1.ebuild:
   Added ~sparc keyword.
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index a9acf0cda242..9b49310854dc 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,24 +1,24 @@
-MD5 fa766d98373bdde88c32923a595de2e9 ChangeLog 8567
-MD5 0dbbcefc8f343dc19c45cdb297c12a15 courier-imap-1.7.3-r1.ebuild 6888
-MD5 6e3b21e8c7f2ca3d2a21b944443c8df2 courier-imap-2.1.2-r1.ebuild 7416
+MD5 2c283d64427e24d1c661059e2c61c6d5 courier-imap-2.1.2-r1.ebuild 7576
+MD5 8c941e738356cca57efe81b1fca56130 courier-imap-1.7.3-r1.ebuild 6887
+MD5 40e15780666a967eead3decfe20b28f2 ChangeLog 8672
 MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
-MD5 e2b026fe60176521e97df76389366955 files/authdaemond.conf 457
-MD5 9249739b006f7f0daa345dd8ac6e6b5b files/authdaemond.rc6 977
+MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
 MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
+MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
+MD5 6eabb1afe28900b3ed92bc9889116303 files/courier-imapd-ssl.rc6 1207
+MD5 420424625a31fa7dc9378e7877faba7a files/courier-imapd.rc6 952
+MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
+MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
+MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
 MD5 8518e782ded83266586160919806ec06 files/courier-imap-2.1.2-removerpm.patch 4308
-MD5 c5993255c6be57914cb943789f59931e files/courier-imapd-ssl.rc6 1208
-MD5 fc75e6af35eeaecec10d7276e9b61747 files/courier-imapd.rc6 953
-MD5 32bc690ac270adbfe95dbbeaab37904b files/courier-pop3d-ssl.rc6 1216
-MD5 572530bc373ee70a6f524d554b1d139c files/courier-pop3d.rc6 961
 MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3-r1 72
-MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r1 72
-MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
+MD5 8df275b074ff61602d3c0e0bbfcc9750 files/authdaemond.conf 456
 MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
+MD5 8f8fe760e10ffe35689d791e1d7b8d16 files/courier-pop3d-ssl.rc6 1215
+MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
 MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
-MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
-MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
-MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
-MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
 MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
-MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
+MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r1 72
+MD5 12b60a6d075d607adf99f90af1a300e3 files/authdaemond.rc6 976
+MD5 70a104ae9721e2f5d86a8f7c326d9f1d files/courier-pop3d.rc6 960
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
diff --git a/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild b/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild
index 2dd548779061..b5705f3ae977 100644
--- a/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild,v 1.8 2004/01/08 12:20:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild,v 1.9 2004/01/19 01:10:19 robbat2 Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -110,6 +110,10 @@ src_compile() {
 		ewarn "The package presently provides no way to disable fam support if you don't want it"
 	fi
 
+	# fix for non-x86 platforms, bug #38606 
+	# courier-imap doesn't respect just --host=$CHOST without --build
+	[ -z "${CBUILD}" ] && export CBUILD="${CHOST}"
+	
 	# Do the actual build now
 	LDFLAGS="${LDFLAGS}" econf \
 		--disable-root-check \