summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gardiner <obz@gentoo.org>2005-03-13 02:25:12 +0000
committerMike Gardiner <obz@gentoo.org>2005-03-13 02:25:12 +0000
commit99380ca42ce58a48f1a3d7b8e793b7ecc552cadf (patch)
treed760667981b3016dc3406c94b72c21158455b53e /mail-client
parentMarked ~amd64, keywording KDE split ebuilds, bug 80944. (diff)
downloadgentoo-2-99380ca42ce58a48f1a3d7b8e793b7ecc552cadf.tar.gz
gentoo-2-99380ca42ce58a48f1a3d7b8e793b7ecc552cadf.tar.bz2
gentoo-2-99380ca42ce58a48f1a3d7b8e793b7ecc552cadf.zip
Added evolution-data-server blocker to evolution-1.4.6, as it links with the wrong libraries (eg libebook.so). See bug #72487 for more details. Thanks to <zany@triq.net>.
(Portage version: 2.0.51.19)
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/evolution/ChangeLog7
-rw-r--r--mail-client/evolution/evolution-1.4.6.ebuild7
2 files changed, 11 insertions, 3 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index d4872669e212..3c359a017d9b 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for mail-client/evolution
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.53 2005/03/11 10:08:11 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.54 2005/03/13 02:25:12 obz Exp $
+
+ 13 Mar 2005; Mike Gardiner <obz@gentoo.org> evolution-1.4.6.ebuild:
+ Added evolution-data-server blocker to evolution-1.4.6, as it links with the
+ wrong libraries (eg libebook.so). See bug #72487 for more details. Thanks to
+ <zany@triq.net>.
11 Mar 2005; Joe McCann <joem@gentoo.org> evolution-2.2.0.ebuild:
add hard dep on >=pango-1.8.1 to get around font rendering problems
diff --git a/mail-client/evolution/evolution-1.4.6.ebuild b/mail-client/evolution/evolution-1.4.6.ebuild
index a9e47cd67e94..b91760b3ade4 100644
--- a/mail-client/evolution/evolution-1.4.6.ebuild
+++ b/mail-client/evolution/evolution-1.4.6.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/mail-client/evolution/evolution-1.4.6.ebuild,v 1.17 2005/01/08 23:36:24 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.6.ebuild,v 1.18 2005/03/13 02:25:12 obz Exp $
inherit flag-o-matic virtualx gnome2 eutils alternatives
@@ -45,7 +45,10 @@ RDEPEND="=gnome-extra/libgtkhtml-3.0.10*
ssl? ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
ldap? ( >=net-nds/openldap-2.0 )
kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
- doc? ( >=app-text/scrollkeeper-0.3.10-r1 )"
+ doc? ( >=app-text/scrollkeeper-0.3.10-r1 )
+ !gnome-extra/evolution-data-server"
+# libebook conflicts with eds and evolution 1.4 links against
+# it incorrectly, see bug #72487 <obz@gentoo.org>
DEPEND="${RDEPEND}
>=sys-apps/sed-4