diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2005-12-29 23:16:03 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2005-12-29 23:16:03 +0000 |
| commit | 4b5e4654b488a8ea52e6791029ca2e0ed09f76ca (patch) | |
| tree | e1686a1bc7f00e222e4cb058c6c992bba42acd84 /gnome-extra | |
| parent | Adding new local use flags for antlr (diff) | |
| download | gentoo-2-4b5e4654b488a8ea52e6791029ca2e0ed09f76ca.tar.gz gentoo-2-4b5e4654b488a8ea52e6791029ca2e0ed09f76ca.tar.bz2 gentoo-2-4b5e4654b488a8ea52e6791029ca2e0ed09f76ca.zip | |
Fix check to ensure both ldap and kerberos, not either. Bug #117041
(Portage version: 2.1_pre2)
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/evolution-exchange/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-extra/evolution-exchange/Manifest | 12 | ||||
| -rw-r--r-- | gnome-extra/evolution-exchange/evolution-exchange-2.4.2.ebuild | 4 |
3 files changed, 7 insertions, 14 deletions
diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog index 373f7e258098..4333d31d25e7 100644 --- a/gnome-extra/evolution-exchange/ChangeLog +++ b/gnome-extra/evolution-exchange/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-extra/evolution-exchange # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.6 2005/12/05 01:19:13 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.7 2005/12/29 23:16:03 dang Exp $ + + 29 Dec 2005; <dang@gentoo.org> evolution-exchange-2.4.2.ebuild: + Fix check to ensure both ldap and kerberos, not either. Bug #117041 *evolution-exchange-2.4.2 (05 Dec 2005) diff --git a/gnome-extra/evolution-exchange/Manifest b/gnome-extra/evolution-exchange/Manifest index b2304baccb94..1dd7668474ae 100644 --- a/gnome-extra/evolution-exchange/Manifest +++ b/gnome-extra/evolution-exchange/Manifest @@ -1,17 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 4c8fe66e0eaa7c6426b179f446a0737b ChangeLog 1262 MD5 ecad4ba5fcd290f39ccb2776da114fa8 evolution-exchange-2.4.1.ebuild 1342 -MD5 72eab5208fe6151147ce0affd2aaed0c evolution-exchange-2.4.2.ebuild 1342 +MD5 851a8ee9f1aaa13d0acfe30cd82154f4 evolution-exchange-2.4.2.ebuild 1342 MD5 1fac0d46b9c505c385acfcff5c0215f9 files/digest-evolution-exchange-2.4.1 78 MD5 b1ebcb59defa26446f2da0a510937a76 files/digest-evolution-exchange-2.4.2 78 MD5 8e9cb8386aac62d3a0124200f562db09 files/evolution-exchange-2.4.0-kerb.patch 576 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux) - -iD8DBQFDk5WEomPajV0RnrERArVLAKCEiZVZuPCYEbB8lfgWTfXH/hUSuQCfeoja -c3rNtpYF7qvKswrfeEwkXjE= -=fZ0L ------END PGP SIGNATURE----- diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.4.2.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.4.2.ebuild index f40e0529ca01..9137cfed0035 100644 --- a/gnome-extra/evolution-exchange/evolution-exchange-2.4.2.ebuild +++ b/gnome-extra/evolution-exchange/evolution-exchange-2.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.4.2.ebuild,v 1.1 2005/12/05 01:19:13 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.4.2.ebuild,v 1.2 2005/12/29 23:16:03 dang Exp $ inherit gnome2 eutils @@ -34,7 +34,7 @@ USE_DESTDIR="1" pkg_setup() { G2CONF="${G2CONF} $(use_with debug e2k-debug) --with-krb5=/usr" - if ! built_with_use gnome-extra/evolution-data-server ldap && ! built_with_use gnome-extra/evolution-data-server kerberos; then + if ! built_with_use gnome-extra/evolution-data-server ldap || ! built_with_use gnome-extra/evolution-data-server kerberos; then eerror "Please re-emerge gnome-extra/evolution-data-server with" eerror "the use flags ldap and kerberos." die |