summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Scherbaum <dertobi123@gentoo.org>2009-07-03 16:06:23 +0000
committerTobias Scherbaum <dertobi123@gentoo.org>2009-07-03 16:06:23 +0000
commit726faeeeb0202f760fe808c45bf19bb01864210a (patch)
treeb8c420fe078bc00900cde4b6fa48123757d6bd7e /net-mail
parentCleanup old versions. (diff)
downloadhistorical-726faeeeb0202f760fe808c45bf19bb01864210a.tar.gz
historical-726faeeeb0202f760fe808c45bf19bb01864210a.tar.bz2
historical-726faeeeb0202f760fe808c45bf19bb01864210a.zip
Fix compilation with USE='kerberos', #274838
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/cyrus-imap-admin/ChangeLog6
-rw-r--r--net-mail/cyrus-imap-admin/Manifest7
-rw-r--r--net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14-r1.ebuild10
-rw-r--r--net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14.ebuild10
4 files changed, 25 insertions, 8 deletions
diff --git a/net-mail/cyrus-imap-admin/ChangeLog b/net-mail/cyrus-imap-admin/ChangeLog
index 75f75cffdbaf..9554c5d19343 100644
--- a/net-mail/cyrus-imap-admin/ChangeLog
+++ b/net-mail/cyrus-imap-admin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-mail/cyrus-imap-admin
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.84 2009/06/12 20:42:43 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/ChangeLog,v 1.85 2009/07/03 16:06:23 dertobi123 Exp $
+
+ 03 Jul 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+ cyrus-imap-admin-2.3.14.ebuild, cyrus-imap-admin-2.3.14-r1.ebuild:
+ Fix compilation with USE='kerberos', #274838
*cyrus-imap-admin-2.3.14-r1 (12 Jun 2009)
diff --git a/net-mail/cyrus-imap-admin/Manifest b/net-mail/cyrus-imap-admin/Manifest
index dd98fa442afc..40da93454ef8 100644
--- a/net-mail/cyrus-imap-admin/Manifest
+++ b/net-mail/cyrus-imap-admin/Manifest
@@ -5,7 +5,8 @@ AUX cyrus-imap-admin-2.3.14-kolab-annotations.patch 2980 RMD160 2c36aab1b8fde716
DIST cyrus-imapd-2.3.13.tar.gz 2328467 RMD160 dfcc8efaf5f3495b8fc83834541c92b6481e28de SHA1 95877dc1e1da5d268b1c248357fbd05749fac72e SHA256 f651c3f5112d3aefa5ab5250f9cb9bb012046a0c3bd72eabb82da9dde1150fba
DIST cyrus-imapd-2.3.14.tar.gz 2348808 RMD160 03fd8bdef669786f58ddf8b3fa0e0a57b2ee6b69 SHA1 cf046e2399b5ae84c654c6ab04eb047341d93002 SHA256 fd840403c1f25adda8f003ea59169e2c87210c4e60ca47c498bda7060ed097a0
EBUILD cyrus-imap-admin-2.3.13.ebuild 1983 RMD160 55bd62cb503a735deecc87d169541eeee6d01afd SHA1 cb1f7d334610e8b0a806e4106d5a3973cde06e52 SHA256 d643eba3592875f88e6d942ad3e672cdd2383b88198a6ffd8d45454923776831
-EBUILD cyrus-imap-admin-2.3.14-r1.ebuild 1947 RMD160 fbe64676e0c555831680612e4453e7804ceeb447 SHA1 abf5c90c07f9d05ffe95a9737135ed777d1c0611 SHA256 4f435927d4339b21bbf0c02262a1fc8e103f6e8012392ea62fef89a0ca41488e
-EBUILD cyrus-imap-admin-2.3.14.ebuild 1803 RMD160 717e875880bb6a234ba81d8912f5a0e93ed45afc SHA1 b8b1f49f54ff7314d878d821ac8585f7b95df9af SHA256 b2d1b30206b74150c38b5cc9a5a230ba1fcce5ea1a8cff176747b945dd6a659d
-MISC ChangeLog 12532 RMD160 d04c804f35a16908cc49b9ccaa82479896c823bf SHA1 3a48a529e1d9e77b04b53ca1be1ec90d502d1d01 SHA256 62b549a2c04edf1e8bcebb57eebfd9a466121235d18bb6f5970962d98fc9f06f
+EBUILD cyrus-imap-admin-2.3.14-r1.ebuild 2129 RMD160 d18e0623351ebeaf6bd46264c1ec184015452617 SHA1 c92db4f3dae9ccb176e245aa230503457d95ba68 SHA256 d297e6d90e667561a6dfae44fde2114a475cd10957f27169f9c3bd79d97601c0
+EBUILD cyrus-imap-admin-2.3.14.ebuild 1992 RMD160 074b55180af4f4c1cf987238c7d4f71c6a29261e SHA1 457fd2f0ae07e4994f20c64d3e5f3b2a04231a74 SHA256 ed9ef755081f0bdbdab406304f3ab08b04b3dce1d394b1b4881a829ed7bb0bf0
+MISC ChangeLog 12705 RMD160 b7291216ee41cef2014ded97557deb4a3baf8956 SHA1 e6e97f879188c744ea5180c743532b8b9ae138c8 SHA256 493f1058c51a47a5a60a78bd2f8a9c213996b795422fb2ab9c9985c370a9d9cf
+MISC cyrus-imap-admin-2.3.14.ebuild.orig 1803 RMD160 717e875880bb6a234ba81d8912f5a0e93ed45afc SHA1 b8b1f49f54ff7314d878d821ac8585f7b95df9af SHA256 b2d1b30206b74150c38b5cc9a5a230ba1fcce5ea1a8cff176747b945dd6a659d
MISC metadata.xml 227 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 SHA1 82018ee8f0b71c0e29e01aa374a89275a46dde26 SHA256 d3c03c4962fef1e25acac4875ada3102e5122e3eb7292d83d9833df8ef581d5c
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14-r1.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14-r1.ebuild
index f8391800598b..d4bbf0654fe6 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14-r1.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14-r1.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/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14-r1.ebuild,v 1.1 2009/06/12 20:42:43 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14-r1.ebuild,v 1.2 2009/07/03 16:06:23 dertobi123 Exp $
inherit autotools perl-app eutils
@@ -55,7 +55,13 @@ src_compile() {
local myconf
myconf="${myconf} `use_with ssl openssl`"
- myconf="${myconf} `use_with kerberos krb`"
+ myconf="${myconf} $(use_enable kerberos gssapi) $(use_enable kerberos krb5afspts)"
+
+ if use kerberos; then
+ myconf="${myconf} --with-krb=$(krb5-config --prefix) --with-krbdes=no"
+ else
+ myconf="${myconf} --with-krb=no"
+ fi
econf \
--disable-server \
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14.ebuild
index f0e1b94715b3..12a89eb944c5 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14.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/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14.ebuild,v 1.5 2009/06/08 03:33:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.3.14.ebuild,v 1.6 2009/07/03 16:06:23 dertobi123 Exp $
inherit autotools perl-app eutils
@@ -50,7 +50,13 @@ src_compile() {
local myconf
myconf="${myconf} `use_with ssl openssl`"
- myconf="${myconf} `use_with kerberos krb`"
+ myconf="${myconf} $(use_enable kerberos gssapi) $(use_enable kerberos krb5afspts)"
+
+ if use kerberos; then
+ myconf="${myconf} --with-krb=$(krb5-config --prefix) --with-krbdes=no"
+ else
+ myconf="${myconf} --with-krb=no"
+ fi
econf \
--disable-server \