Do not pull in libgweather-3 (bug #393253, thanks to megabaks for reporting).

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

5 files changed, 19 insertions, 11 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 82652d375187..7f528597daff 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.351 2011/11/16 00:33:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.352 2011/12/07 07:33:05 tetromino Exp $
+
+  07 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-2.32.2-r3.ebuild, evolution-2.32.3.ebuild,
+  evolution-2.32.3-r1.ebuild:
+  Do not pull in libgweather-3 (bug #393253, thanks to megabaks for reporting).
 
 *evolution-3.2.2 (16 Nov 2011)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 65ef0a4b3895..6a5a7033003b 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -12,17 +12,17 @@ DIST evolution-2.32.3-patches.tar.xz 11784 RMD160 34e536268814b2c41fd081321f3435
 DIST evolution-2.32.3.tar.bz2 31966138 RMD160 1b64d00a38cf8ad5c273cc4f4aee73124fe818af SHA1 cc2a2126ef4192193dce50c43c5bb6fc0a57fcde SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb
 DIST evolution-3.2.1.tar.xz 11472552 RMD160 32ae1274c938627df2ae971b244e3a65968a1eb9 SHA1 3e74817a299adb5830cc076094e9f7fe74a0a1c1 SHA256 244d4fcf57d59b3fe0bcedddc65da5f508b253cb64159e6ddb2bddedf8d7e19a
 DIST evolution-3.2.2.tar.xz 11489564 RMD160 494db8147be89f62a337dcd357c3ba0eabc1047b SHA1 cae31984cfbcd26a8848a7b94a0f4957502ae173 SHA256 03c68242bbf494dda3bf34f52ec843c282c9bb07f9415a69fe58237c7efbbe7d
-EBUILD evolution-2.32.2-r3.ebuild 5653 RMD160 52fd96ac8254f310c0e5a078d5b6480887638b65 SHA1 092619b005c59d71a5963cf2fee6b836a8b25f54 SHA256 ab15b580837e215876c5b628087f24ad731b59693d207bc8d6ab25ede1d7b407
-EBUILD evolution-2.32.3-r1.ebuild 5791 RMD160 d84afda28cacc6b0845d10a34b1be77245f4df8f SHA1 e950a0b6792969adf903639faca706423dcaa4a2 SHA256 9807e61004c5f7baeed20f0b35a01a7cc2e56a22aadba1c0dbb748ec0f967bb4
-EBUILD evolution-2.32.3.ebuild 5515 RMD160 cd24a25537b3ccc1ced1f919140a9b03989fa2a4 SHA1 0274116b70817f148fc9acd021d990f9f8ad1d81 SHA256 ba5dcb05db7dbaab73c2bad4aa20c401ac5577f34a0f890f25f0ff4deb5230bd
+EBUILD evolution-2.32.2-r3.ebuild 5683 RMD160 cbedf2c9c6253c91d3e4cb1374029a2789970a0f SHA1 502dcd7f664b0a3136e2797a25eb1ef4462a9aa6 SHA256 d45aa5e05e88bbb27790fbd6dc917219578be4ae9aa30765cee00397e629af08
+EBUILD evolution-2.32.3-r1.ebuild 5821 RMD160 1ab15ed584a5400c1e53a7cb6a112b6b50f7a159 SHA1 1e261cd223c72137f18ed6c7d4d4a25d137e8f5c SHA256 b58fcdaa7906349bc73f211efd76110e2ff1a6f4f151b0e9f3f79d2ff7d13d2c
+EBUILD evolution-2.32.3.ebuild 5545 RMD160 0240a28891343b86635f84e332a337c21d366ba0 SHA1 212d38408b797969b35efa0480bd6f17af6e6216 SHA256 54d2c7c8e6d4892e19e9f7d3f4b1de74221c24df96d95b4a9142b69b00c0f93f
 EBUILD evolution-3.2.1.ebuild 5368 RMD160 56fc0308b83a6b74ed2564ada2e0f01bd90a1dfd SHA1 41705a4de148ba84e939f1594ef518d83b33dd22 SHA256 1bc4892b7a7dd63bfe4524c049a9ef145e544979efd5c12e1a5469acde2e1fa9
 EBUILD evolution-3.2.2.ebuild 5368 RMD160 cdd206878f7ee5495e12501f69c479cddd7e89c3 SHA1 f8b2e0a12c4c3de44b2a7f26e6bafd443334b459 SHA256 330e193af0293e4442cafda33a50e762a4d443a523a2fb5a6cf587bc41806286
-MISC ChangeLog 80155 RMD160 2a6fac37f268e231b1e7011e7ee498127e72e33b SHA1 b935241e272269c8ad06e176cd6f496cefb00590 SHA256 6977d255a97636b45bc806c7d4d587cd88821073e9dddc3e41215a4a2d8a9ca0
+MISC ChangeLog 80380 RMD160 c691300622f329f935178f7f1f46e3ac43736b7a SHA1 a42f7000faafaec31def3311cada399975f70e7a SHA256 6f872fb27f3973d8cce116951818e640695255f5e7f0880cca4e64a3067a80ca
 MISC metadata.xml 1097 RMD160 b1d9ba9ac1576e4e70d144b4db37c221ca6290dd SHA1 5f659a37f0021e82eb8fe9572d87d2af2ffe212c SHA256 fd96c4817ed5c032a35790835aa072abbee8188b443e43f591badb35f8b38147
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7DBNkACgkQdjK8w9WeBnC1YgEAuaygBjvTRaGJXaFhtAkZEL2u
-X4bDhpMErxJAthbXVLsA/A7S0Bb6/VWN4tHD0YTsMldR8KwMldcMKvTe2cdl6hBw
-=XViP
+iF4EAREIAAYFAk7fFrQACgkQdjK8w9WeBnC6aQEAgddb3MCsDOTm1+My+yb8LwY3
+f3xwdnuslKll+uqHN6UBAIGhaiETBz1v9UF6rFirIm8wEy2DkeThNPWPHXr2X/tA
+=t5lZ
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.32.2-r3.ebuild b/mail-client/evolution/evolution-2.32.2-r3.ebuild
index a6f69f4f71ec..2a3adcb3a7e7 100644
--- a/mail-client/evolution/evolution-2.32.2-r3.ebuild
+++ b/mail-client/evolution/evolution-2.32.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild,v 1.8 2011/11/16 00:33:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild,v 1.9 2011/12/07 07:33:05 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -33,6 +33,7 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=dev-libs/libunique-1.1.2:1
 	>=gnome-base/gnome-desktop-2.26:2
 	>=dev-libs/libgweather-2.25.3:2
+	<dev-libs/libgweather-2.91:2
 	media-libs/libcanberra[gtk]
 	>=x11-libs/libnotify-0.3
 	>=gnome-extra/evolution-data-server-${PV}[weather]
diff --git a/mail-client/evolution/evolution-2.32.3-r1.ebuild b/mail-client/evolution/evolution-2.32.3-r1.ebuild
index afc7ec74c94b..82f22c0efe37 100644
--- a/mail-client/evolution/evolution-2.32.3-r1.ebuild
+++ b/mail-client/evolution/evolution-2.32.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.3 2011/11/16 00:33:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.4 2011/12/07 07:33:05 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -34,6 +34,7 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=dev-libs/libunique-1.1.2:1
 	>=gnome-base/gnome-desktop-2.26:2
 	>=dev-libs/libgweather-2.25.3:2
+	<dev-libs/libgweather-2.91:2
 	media-libs/libcanberra[gtk]
 	>=x11-libs/libnotify-0.3
 	>=gnome-extra/evolution-data-server-${PV}[weather]
diff --git a/mail-client/evolution/evolution-2.32.3.ebuild b/mail-client/evolution/evolution-2.32.3.ebuild
index feda8bd3b8ec..986325c79ce6 100644
--- a/mail-client/evolution/evolution-2.32.3.ebuild
+++ b/mail-client/evolution/evolution-2.32.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild,v 1.8 2011/11/16 00:33:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild,v 1.9 2011/12/07 07:33:05 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -34,6 +34,7 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=dev-libs/libunique-1.1.2:1
 	>=gnome-base/gnome-desktop-2.26:2
 	>=dev-libs/libgweather-2.25.3:2
+	<dev-libs/libgweather-2.91:2
 	media-libs/libcanberra[gtk]
 	>=x11-libs/libnotify-0.3
 	>=gnome-extra/evolution-data-server-${PV}[weather]