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>.

Package-Manager: portage-2.0.51.19

3 files changed, 24 insertions, 26 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/Manifest b/mail-client/evolution/Manifest
index a4c9f57b2461..3c8b672bd863 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,42 +1,32 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 553d7f829b851b8980d529f20f32805f ChangeLog 23542
+MD5 1d4e3a8de9befc05ab42fec6c709e411 ChangeLog 23789
 MD5 f8967572708473b4e0c251f754929631 evolution-1.2.4.ebuild 6254
-MD5 0e26bab8ac570ce0deb481e2249e69f2 evolution-1.4.6.ebuild 5701
-MD5 8ec4daeb3d6cfce98637075f33550b0b evolution-2.0.2-r1.ebuild 4079
+MD5 3475daa33f47826a680247442d143856 evolution-1.4.6.ebuild 5846
 MD5 38beda8b6f053d01b75341ea0c888322 evolution-2.0.2.ebuild 4054
+MD5 6ec9b6a7896b799d17a21c4edffd33c9 metadata.xml 272
+MD5 7c0483bef60bedff8559f3b9043d0f7e evolution-2.0.3.ebuild 3966
+MD5 8ec4daeb3d6cfce98637075f33550b0b evolution-2.0.2-r1.ebuild 4079
 MD5 6ce020116cdfd530f866baff39b6ce5c evolution-2.0.3-r1.ebuild 4015
 MD5 b48f8c37ec0e362bd3b7312ffc3851d3 evolution-2.0.3-r2.ebuild 4114
-MD5 7c0483bef60bedff8559f3b9043d0f7e evolution-2.0.3.ebuild 3966
 MD5 bd65828630277b9584f936c26719e5c5 evolution-2.0.4.ebuild 3999
-MD5 6ec9b6a7896b799d17a21c4edffd33c9 metadata.xml 272
 MD5 fa8d4c36bb5fd28dc7ce85cfa5414d63 evolution-2.2.0.ebuild 4006
 MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
 MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
-MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2 70
-MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2-r1 70
 MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3 70
-MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r1 70
-MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70
-MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70
-MD5 66cb81c792d948e4f84a47bb0247a403 files/digest-evolution-2.2.0 70
+MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2 70
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
 MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
 MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
 MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
 MD5 6e58f5e7a4195267cc545d8c9eba07a3 files/evolution-1.5.93-addressbooklibs.patch 564
-MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
 MD5 dc2deff6647a30a151572ec5d6e11c77 files/evolution-2.0.1-camel.patch 457
 MD5 8a4178ab2571a9be24e1c27cfedf20bb files/evolution-2.0.2-camel_typo.patch 298
 MD5 8cc9e70dc9a35125fa2a37d58be5d139 files/evolution-2.0.2-gentoo_etc_services.patch 1712
-MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
 MD5 4df81c3442025403034c53975ba663b1 files/evolution-gcc34.patch 3044
+MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
+MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2-r1 70
+MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r1 70
+MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
+MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70
+MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70
+MD5 66cb81c792d948e4f84a47bb0247a403 files/digest-evolution-2.2.0 70
 MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCMW39XjcVihsel0ERAuqMAJ9W2mYmW6vknZ0KLfATARrCdCthUgCg8+uH
-hG2JhxUCEWz8IqlTghhrQwY=
-=xi2T
------END PGP SIGNATURE-----
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