summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2009-07-24 07:47:06 +0000
committerFabian Groffen <grobian@gentoo.org>2009-07-24 07:47:06 +0000
commitfa39457f0716a8b41951d7a6480391d16d73c11c (patch)
treebe6766cf2011b2b646eff75337cc5982299d5c51 /mail-mta
parentVersion bump. (diff)
downloadhistorical-fa39457f0716a8b41951d7a6480391d16d73c11c.tar.gz
historical-fa39457f0716a8b41951d7a6480391d16d73c11c.tar.bz2
historical-fa39457f0716a8b41951d7a6480391d16d73c11c.zip
Exim uses libiconv for header expansion, make this dependency explicit and do what's necessary for non-glibc platforms
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'mail-mta')
-rw-r--r--mail-mta/exim/ChangeLog6
-rw-r--r--mail-mta/exim/Manifest4
-rw-r--r--mail-mta/exim/exim-4.69-r2.ebuild8
3 files changed, 14 insertions, 4 deletions
diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 858d6a1967db..5487ac03a3df 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,10 @@
# 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.141 2009/07/24 07:21:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.142 2009/07/24 07:47:06 grobian Exp $
+
+ 24 Jul 2009; Fabian Groffen <grobian@gentoo.org> exim-4.69-r2.ebuild:
+ Exim uses libiconv for header expansion, make this dependency explicit and
+ do what's necessary for non-glibc platforms
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
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 75a69c12c2b4..f07f963b6716 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 10149 RMD160 c4f6b53f73d6aa6c3bfed3ff4efd7c1a4a59ee30 SHA1 07729e4daff90ea01f116bbc4e4f6cea8b72e04c SHA256 9faa8ac51c35bc1664e0eafb29178fb2fe1f89b13972ea43f26919d66d1c202d
+EBUILD exim-4.69-r2.ebuild 10345 RMD160 d987272a88f99d0e39c5aa478867e95e219f82f8 SHA1 78537462afe2b342623d5ac434059c2d6283711b SHA256 567f2ac8d7be3e98f05d5ece05d853eb39522343f9392280cffe8398a4567ed6
EBUILD exim-4.69.ebuild 9906 RMD160 9b244dbbde9d454ea7be15bc46071e99943ec163 SHA1 ab0cfcfbe15b98681d79e077dab3195b0c1aadbe SHA256 6f5a4c76b40df44e203d86afbeba637b1a752349e0e3568cc08127fea204f915
-MISC ChangeLog 31673 RMD160 3936a0f17b7348f1f70f7a0a15a3381b5c59dd07 SHA1 702fa80b3cf32ad11e248efa63712bfe6ad55f46 SHA256 c94c889c6ed61a10889844f257cee1d7fba95c509f066abc95dbdac04eb924e4
+MISC ChangeLog 31869 RMD160 35c32214118a2be46c08474526696df9651bad90 SHA1 5a4c1dfafc6ba71232ac0924e15332757e81bdc3 SHA256 904a9d9c15fb271f3e4b33b2253d78680c0e250efbc73dd1e1f15a10bc40ec54
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 d74cd4dca87d..8c86a51623c6 100644
--- a/mail-mta/exim/exim-4.69-r2.ebuild
+++ b/mail-mta/exim/exim-4.69-r2.ebuild
@@ -1,6 +1,6 @@
# 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.8 2009/07/24 07:21:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r2.ebuild,v 1.9 2009/07/24 07:47:06 grobian Exp $
inherit eutils toolchain-funcs multilib pam
@@ -41,6 +41,7 @@ DEPEND=">=sys-apps/sed-4.0.5
radius? ( net-dialup/radiusclient )
domainkeys? ( mail-filter/libdomainkeys )
logrotate? ( app-admin/logrotate )
+ virtual/libiconv
"
# added X check for #57206
RDEPEND="${DEPEND}
@@ -157,6 +158,11 @@ src_unpack() {
echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile
fi
+ # Make iconv usage explicit
+ echo "HAVE_ICONV=yes" >> Makefile
+ # If we use libiconv, now is the time to tell so
+ use !elibc_glibc && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
+
cd "${S}"
if use ssl; then
sed -i \