wrap hal in hal?(), otherwise problems arise with some profiles.

Package-Manager: portage-2.1_pre10

5 files changed, 57 insertions, 30 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 7310a13a2dc3..6e18a67d9dfa 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.117 2006/04/20 23:43:20 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.118 2006/04/30 14:29:35 allanonjl Exp $
+
+  30 Apr 2006; John N. Laliberte <allanonjl@gentoo.org>
+  evolution-2.6.0-r1.ebuild:
+  wrap hal in hal?(), otherwise problems arise with some profiles.
 
 *evolution-2.6.0-r1 (20 Apr 2006)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 945df32d2010..6b4bf2836463 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,54 +1,73 @@
-MD5 0dc02715992f39ecaea2da4e09657a76 ChangeLog 33599
-RMD160 d8fff257d24f6d1e375c040cb056c77e431ca3fa ChangeLog 33599
-SHA256 9d3f027fb13f70f3a0161f5c1d18dec3b7ff46ba31830bd6232dce5c0a9f2b71 ChangeLog 33599
-MD5 b79c5ccc56e7e370472f66aa4ba28d68 evolution-2.0.3-r2.ebuild 4203
-RMD160 f6949275136453c3f437192ca54c2961137f4b0c evolution-2.0.3-r2.ebuild 4203
-SHA256 807bfb77ae001822844a95fa69c0dcff076b0d04addfdb8739a6608b47c2ad25 evolution-2.0.3-r2.ebuild 4203
-MD5 872e077d3d53ff79474d1572befbc0a8 evolution-2.0.4.ebuild 4090
-RMD160 1bd953ea6b70fca3e51ddc78c66fe46302f11736 evolution-2.0.4.ebuild 4090
-SHA256 be6de66fa2c1b5d5d1456342b302231ea1cba2ebd8e97bbf36d59287ad4208d0 evolution-2.0.4.ebuild 4090
-MD5 4f31d4d9452857478885bfa9bab14e4f evolution-2.4.2.1.ebuild 5760
-RMD160 d25cf15d1d96c61e60cae0314ff89ccec0d9ff96 evolution-2.4.2.1.ebuild 5760
-SHA256 bdb9b441fa2edd27f8f1370edd52332cf7ad52646ddc953f0374617bf97a3c58 evolution-2.4.2.1.ebuild 5760
-MD5 71f1a230101343d1d8b76c9d531554ba evolution-2.6.0-r1.ebuild 6030
-RMD160 0b3625fd4a3833dd0fb57436407148c88b0f9311 evolution-2.6.0-r1.ebuild 6030
-SHA256 9ca8ceefe4748467a4d2df1ea0e2309d712d5fa910fe4ef9e28b596fef602dd5 evolution-2.6.0-r1.ebuild 6030
-MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70
-RMD160 a73c2d06f116621d2314f5fa5b4f715888826716 files/digest-evolution-2.0.3-r2 70
-SHA256 1abde5358f83c2740a72f605912929fe70883a1c58a4bb1d2998a05711b620d5 files/digest-evolution-2.0.3-r2 70
-MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70
-RMD160 32a81d84d0226e431a3721f349c6cd3207adae78 files/digest-evolution-2.0.4 70
-SHA256 dd29aee5b289a0dd9b62323361b8338525bfcc0a14ec2970ad25272ca5fee5bb files/digest-evolution-2.0.4 70
-MD5 c26dc1fd2762cde6c32c4c52d3ce9644 files/digest-evolution-2.4.2.1 262
-RMD160 59ab19f6fa13bb17b8756d4ea326d9827b839bf8 files/digest-evolution-2.4.2.1 262
-SHA256 66512ea95e1843f7da7daff072e06ae1c770a51c57cf954c66d8924ba2c9213c files/digest-evolution-2.4.2.1 262
-MD5 b7135bdb52f97014752d5b38603dff6c files/digest-evolution-2.6.0-r1 533
-RMD160 0356403d31a87ee66ad947d6a3c9c6ae5f3c0213 files/digest-evolution-2.6.0-r1 533
-SHA256 c9b2f3e30b0cd1b7dd81baddb73e424b997a4b7e32a1930bfcbd2d163fc0f768 files/digest-evolution-2.6.0-r1 533
+AUX evolution-2-CAN-2005-0102.patch 467 RMD160 7fc04d14339759a720c5007f9b75a9d575aa36a1 SHA1 d2567b1f9f90b3e320ae2793ffc110c90204f4c3 SHA256 96984df6e198faf47af75e61c7dea696f6716710583d8fbd8d22437ca5a8aca7 size 467
 MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
 RMD160 7fc04d14339759a720c5007f9b75a9d575aa36a1 files/evolution-2-CAN-2005-0102.patch 467
 SHA256 96984df6e198faf47af75e61c7dea696f6716710583d8fbd8d22437ca5a8aca7 files/evolution-2-CAN-2005-0102.patch 467
+AUX evolution-2.0.3-gentoo_etc_services.patch 1662 RMD160 9ac648a5f055cb5e3e98b5e41547fed0c4a7ad3d SHA1 628bf559a4915bd794893f54c552025fb015e4ce SHA256 e881f56b96b7f5b692f63f7d96705bb70626ff1957d6fabd47090ff76f46acb3 size 1662
 MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
 RMD160 9ac648a5f055cb5e3e98b5e41547fed0c4a7ad3d files/evolution-2.0.3-gentoo_etc_services.patch 1662
 SHA256 e881f56b96b7f5b692f63f7d96705bb70626ff1957d6fabd47090ff76f46acb3 files/evolution-2.0.3-gentoo_etc_services.patch 1662
+AUX evolution-2.2.3-linking-fix.patch 1491 RMD160 1504a120f670a0334ea90153a367ec3a095ac033 SHA1 5e1e6dc83826a2cf3bfff8fd059e69824efdd932 SHA256 210150560c2a95c4f367f35b79e558dabf008e2f238429b98eb6c93f9e6cd6b5 size 1491
 MD5 388d698898d1346cb7007da471abed11 files/evolution-2.2.3-linking-fix.patch 1491
 RMD160 1504a120f670a0334ea90153a367ec3a095ac033 files/evolution-2.2.3-linking-fix.patch 1491
 SHA256 210150560c2a95c4f367f35b79e558dabf008e2f238429b98eb6c93f9e6cd6b5 files/evolution-2.2.3-linking-fix.patch 1491
+AUX evolution-2.3.7-configure_plugins.patch 3010 RMD160 9ae69aa76db215f6c9dcaf251ed03369131d86d8 SHA1 8b996b3a578dcc593c752e240c01516d5ee5c2f9 SHA256 c7aa48137fff3e4f8d8fe0d466ff70e6feadb95ed07402273318d111b8ee3c70 size 3010
 MD5 b5eaa2e30f75b8ec2df29cfd90a1e1f0 files/evolution-2.3.7-configure_plugins.patch 3010
 RMD160 9ae69aa76db215f6c9dcaf251ed03369131d86d8 files/evolution-2.3.7-configure_plugins.patch 3010
 SHA256 c7aa48137fff3e4f8d8fe0d466ff70e6feadb95ed07402273318d111b8ee3c70 files/evolution-2.3.7-configure_plugins.patch 3010
+AUX evolution-2.3.8-gentoo.patch 660 RMD160 394e3ef64b158617977ac5267a1a4adb6d44b133 SHA1 1c97ced74438fd5093d0045c5b7141e86362b47f SHA256 37c1532a729000dbbacaaa56eea5485eeaa14ce78cc0dab3b4cc0fd839b0fc77 size 660
 MD5 35dfdb3422f49ada8891285f5104d29c files/evolution-2.3.8-gentoo.patch 660
 RMD160 394e3ef64b158617977ac5267a1a4adb6d44b133 files/evolution-2.3.8-gentoo.patch 660
 SHA256 37c1532a729000dbbacaaa56eea5485eeaa14ce78cc0dab3b4cc0fd839b0fc77 files/evolution-2.3.8-gentoo.patch 660
+AUX evolution-2.4.2.1-link.patch 2625 RMD160 3a53cb7f6ad46265421fd66e9e6b15fc3bd98b17 SHA1 9776ab5c690a2c933788ce410f941e335e919de4 SHA256 8aa4091d36645b852f4e3ef604d76165806de9fcaf50d990a185546b62ca5b7d size 2625
 MD5 c6f7cb2777a5622bc3ea45b046713895 files/evolution-2.4.2.1-link.patch 2625
 RMD160 3a53cb7f6ad46265421fd66e9e6b15fc3bd98b17 files/evolution-2.4.2.1-link.patch 2625
 SHA256 8aa4091d36645b852f4e3ef604d76165806de9fcaf50d990a185546b62ca5b7d files/evolution-2.4.2.1-link.patch 2625
+AUX evolution-2.5.5.1-sideview.patch 9730 RMD160 3df3caaf77487071e217b2803fe9357b9a6ab2c9 SHA1 d4ed65a575dd55b4a869e6cde2edd82d157f3343 SHA256 cdc2d507df2589ff37b33b72157e3522b5f031969962eef36022930babe5fcbd size 9730
 MD5 9e370064cd61615da09034946b0f066e files/evolution-2.5.5.1-sideview.patch 9730
 RMD160 3df3caaf77487071e217b2803fe9357b9a6ab2c9 files/evolution-2.5.5.1-sideview.patch 9730
 SHA256 cdc2d507df2589ff37b33b72157e3522b5f031969962eef36022930babe5fcbd files/evolution-2.5.5.1-sideview.patch 9730
+AUX evolution_mail-account-gui_authtype.diff 737 RMD160 8d72b2de92d0cbe0823c1324e52b005b79435c40 SHA1 262bd62ec9fb9101e7792bb189fec9efe6fd88af SHA256 54bbdf9df28ac28af4aa457c432197bdcc428e97b69b052718a41400450b32cc size 737
 MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
 RMD160 8d72b2de92d0cbe0823c1324e52b005b79435c40 files/evolution_mail-account-gui_authtype.diff 737
 SHA256 54bbdf9df28ac28af4aa457c432197bdcc428e97b69b052718a41400450b32cc files/evolution_mail-account-gui_authtype.diff 737
+DIST evolution-2.0.3.tar.bz2 15381448 RMD160 411899a8c59a06142a39ff6cbfd0cf59a6b3dde7 SHA256 dfce4790d6724789f35d7e2e4536a1d67051025e06631f95893d47c10a29d1e8 size 15381448
+DIST evolution-2.0.4.tar.bz2 15395184 RMD160 980400d7de33dee702c0624ee3312b3c4556baed SHA256 5d37ee2796ade1ebfc3b3e0dc4919594a3b3119079c055e0c3e935e5954c90c2 size 15395184
+DIST evolution-2.4.2.1.tar.bz2 11503590 RMD160 cb72e939fbd651a43ae09e0341f47e6ebf490c56 SHA256 eae8fed13de8eee9f60606ec0e645876e4b9a1e9bb30d21dace54e3995ca5f40 size 11503590
+DIST evolution-2.5.5.1-bf-junk.tar.bz2 10771 RMD160 7ae764761607d50024fbec32680bc57e04ac7879 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 size 10771
+DIST evolution-2.6.0.tar.bz2 12072895 RMD160 7f01966a6ff8b02ab5f5bf74a120e452cbc32f4d SHA256 9565772416a42ed779d33b55f56183c51baabbf5db6109f1e0d63611d76e7d7d size 12072895
+EBUILD evolution-2.0.3-r2.ebuild 4203 RMD160 f6949275136453c3f437192ca54c2961137f4b0c SHA1 1253032a6f8df7d5832837b8d253417b0263a69d SHA256 807bfb77ae001822844a95fa69c0dcff076b0d04addfdb8739a6608b47c2ad25 size 4203
+MD5 b79c5ccc56e7e370472f66aa4ba28d68 evolution-2.0.3-r2.ebuild 4203
+RMD160 f6949275136453c3f437192ca54c2961137f4b0c evolution-2.0.3-r2.ebuild 4203
+SHA256 807bfb77ae001822844a95fa69c0dcff076b0d04addfdb8739a6608b47c2ad25 evolution-2.0.3-r2.ebuild 4203
+EBUILD evolution-2.0.4.ebuild 4090 RMD160 1bd953ea6b70fca3e51ddc78c66fe46302f11736 SHA1 afe47b366c6ec3a722eaf21d6f9c4e6e0fffe11d SHA256 be6de66fa2c1b5d5d1456342b302231ea1cba2ebd8e97bbf36d59287ad4208d0 size 4090
+MD5 872e077d3d53ff79474d1572befbc0a8 evolution-2.0.4.ebuild 4090
+RMD160 1bd953ea6b70fca3e51ddc78c66fe46302f11736 evolution-2.0.4.ebuild 4090
+SHA256 be6de66fa2c1b5d5d1456342b302231ea1cba2ebd8e97bbf36d59287ad4208d0 evolution-2.0.4.ebuild 4090
+EBUILD evolution-2.4.2.1.ebuild 5760 RMD160 d25cf15d1d96c61e60cae0314ff89ccec0d9ff96 SHA1 d0d30cd2b73a569a5d20483cd3f1d5e3ef37443a SHA256 bdb9b441fa2edd27f8f1370edd52332cf7ad52646ddc953f0374617bf97a3c58 size 5760
+MD5 4f31d4d9452857478885bfa9bab14e4f evolution-2.4.2.1.ebuild 5760
+RMD160 d25cf15d1d96c61e60cae0314ff89ccec0d9ff96 evolution-2.4.2.1.ebuild 5760
+SHA256 bdb9b441fa2edd27f8f1370edd52332cf7ad52646ddc953f0374617bf97a3c58 evolution-2.4.2.1.ebuild 5760
+EBUILD evolution-2.6.0-r1.ebuild 6039 RMD160 d6b190d34f6c4aae6ea90db3b982ba50f6fa68c3 SHA1 8c1ca61d559c059e0d5e437eaaea7eca753b1fad SHA256 f6dc392dc77183ae07212d3febfa5aa2de19694a285473677467f5b5d5c107af size 6039
+MD5 d98e1515b5e196ea070ef84e6ecb5f3d evolution-2.6.0-r1.ebuild 6039
+RMD160 d6b190d34f6c4aae6ea90db3b982ba50f6fa68c3 evolution-2.6.0-r1.ebuild 6039
+SHA256 f6dc392dc77183ae07212d3febfa5aa2de19694a285473677467f5b5d5c107af evolution-2.6.0-r1.ebuild 6039
+MISC ChangeLog 33752 RMD160 a2846fd832b38f85a54ddf91ac3398096ad4b446 SHA1 643258fd2ee7002d6a62d6a8ebe195dc0db6120c SHA256 3277ab7cede4c91c87bc4b8f55d8b706828200d832e7ca913f233032fbf9eb2e size 33752
+MD5 2a8c9d3012cd9d0795e51d69f7544878 ChangeLog 33752
+RMD160 a2846fd832b38f85a54ddf91ac3398096ad4b446 ChangeLog 33752
+SHA256 3277ab7cede4c91c87bc4b8f55d8b706828200d832e7ca913f233032fbf9eb2e ChangeLog 33752
+MISC metadata.xml 285 RMD160 0c12c7c2e6dd66ea44e83541384d6b634c642bc0 SHA1 bbd215b7c718049707751c25e6bfc2318fa0f292 SHA256 0c662917bda7d3035eab7db55ade83dadca650d2ceddc44b7765ba5f898bd816 size 285
 MD5 f0750af493d9560f5faf50f39fd644c5 metadata.xml 285
 RMD160 0c12c7c2e6dd66ea44e83541384d6b634c642bc0 metadata.xml 285
 SHA256 0c662917bda7d3035eab7db55ade83dadca650d2ceddc44b7765ba5f898bd816 metadata.xml 285
+MD5 ca1a1c4c81318606a7d282c03c4dc280 files/digest-evolution-2.0.3-r2 256
+RMD160 debf746f11be6445c0a06fbd4bbf7975566c86ba files/digest-evolution-2.0.3-r2 256
+SHA256 33b044e778ceafb0dedd8d1e5f9bb64405403aeffc7e77a04c452af896b09255 files/digest-evolution-2.0.3-r2 256
+MD5 7d7b2a9ea1a22a715dbfe82d49117aab files/digest-evolution-2.0.4 256
+RMD160 feee73b84182ed96bbb944fc661ed718ee644407 files/digest-evolution-2.0.4 256
+SHA256 ec8649f7158ce85f2bc72476295a6f41486ea78afef9aa875c13dc9d8d467201 files/digest-evolution-2.0.4 256
+MD5 c26dc1fd2762cde6c32c4c52d3ce9644 files/digest-evolution-2.4.2.1 262
+RMD160 59ab19f6fa13bb17b8756d4ea326d9827b839bf8 files/digest-evolution-2.4.2.1 262
+SHA256 66512ea95e1843f7da7daff072e06ae1c770a51c57cf954c66d8924ba2c9213c files/digest-evolution-2.4.2.1 262
+MD5 b7135bdb52f97014752d5b38603dff6c files/digest-evolution-2.6.0-r1 533
+RMD160 0356403d31a87ee66ad947d6a3c9c6ae5f3c0213 files/digest-evolution-2.6.0-r1 533
+SHA256 c9b2f3e30b0cd1b7dd81baddb73e424b997a4b7e32a1930bfcbd2d163fc0f768 files/digest-evolution-2.6.0-r1 533
diff --git a/mail-client/evolution/evolution-2.6.0-r1.ebuild b/mail-client/evolution/evolution-2.6.0-r1.ebuild
index 7136d5d4dca8..49dfefd4c666 100644
--- a/mail-client/evolution/evolution-2.6.0-r1.ebuild
+++ b/mail-client/evolution/evolution-2.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.6.0-r1.ebuild,v 1.1 2006/04/20 23:43:20 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.6.0-r1.ebuild,v 1.2 2006/04/30 14:29:35 allanonjl Exp $
 
 inherit eutils flag-o-matic alternatives gnome2 autotools
 
@@ -37,7 +37,7 @@ RDEPEND=">=x11-themes/gnome-icon-theme-1.2
 	>=gnome-base/libgnome-2
 	>=net-libs/libsoup-2.2
 	>=x11-libs/pango-1.8.1
-	>=sys-apps/hal-0.5.4
+	hal? ( >=sys-apps/hal-0.5.4 )
 	pda? (
 		>=app-pda/gnome-pilot-2
 		>=app-pda/gnome-pilot-conduits-2 )
diff --git a/mail-client/evolution/files/digest-evolution-2.0.3-r2 b/mail-client/evolution/files/digest-evolution-2.0.3-r2
index cd4b309c65c4..6ed05d1bbb6c 100644
--- a/mail-client/evolution/files/digest-evolution-2.0.3-r2
+++ b/mail-client/evolution/files/digest-evolution-2.0.3-r2
@@ -1 +1,3 @@
 MD5 0a6c15b022f001d52b8533c42e83a462 evolution-2.0.3.tar.bz2 15381448
+RMD160 411899a8c59a06142a39ff6cbfd0cf59a6b3dde7 evolution-2.0.3.tar.bz2 15381448
+SHA256 dfce4790d6724789f35d7e2e4536a1d67051025e06631f95893d47c10a29d1e8 evolution-2.0.3.tar.bz2 15381448
diff --git a/mail-client/evolution/files/digest-evolution-2.0.4 b/mail-client/evolution/files/digest-evolution-2.0.4
index 58e5abe0fbc2..ca70ec68fb01 100644
--- a/mail-client/evolution/files/digest-evolution-2.0.4
+++ b/mail-client/evolution/files/digest-evolution-2.0.4
@@ -1 +1,3 @@
 MD5 e5b9bbab0d1f888ce9de41b57989eaa7 evolution-2.0.4.tar.bz2 15395184
+RMD160 980400d7de33dee702c0624ee3312b3c4556baed evolution-2.0.4.tar.bz2 15395184
+SHA256 5d37ee2796ade1ebfc3b3e0dc4919594a3b3119079c055e0c3e935e5954c90c2 evolution-2.0.4.tar.bz2 15395184