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

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

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index aad189843fbe58695635e087531a0ef2f4c945e9..d0adfb31311d637f1fe94f3d6d83cb0635a45ce2 100644 (file)
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.319 2011/12/02 17:58:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.320 2011/12/07 07:33:02 tetromino Exp $
+
+  07 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-data-server-2.32.2.ebuild, evolution-data-server-2.32.2-r1.ebuild,
+  evolution-data-server-2.32.3-r1.ebuild:
+  Do not pull in libgweather-3 (bug #393253, thanks to megabaks for reporting).
 
   02 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   evolution-data-server-3.2.1.ebuild, evolution-data-server-3.2.2.ebuild:

diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index a21508e555372fc6d1ebd8730f8680f8f4a5cb4b..3131ae8163872ee44754774b689cf432782d079f 100644 (file)
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -12,17 +12,17 @@ DIST evolution-data-server-2.32.3-patches.tar.xz 24072 RMD160 2508b5b101f59bb383
 DIST evolution-data-server-2.32.3.tar.bz2 4322281 RMD160 adc8b07aef41a89d16fc426541c12190a3688b8f SHA1 cbf32c3438c4f1650b35b87007a337ebc1c56cec SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c
 DIST evolution-data-server-3.2.1.tar.xz 3724708 RMD160 3b767a101dc33b525b2b13c43d0297c74a2aaf4d SHA1 d735653b64febadbbd447925a06f4714aa2c8678 SHA256 0091e41e87d589a984c6d089919fece2d28101df5b37e4b2d8615efdf60a09c3
 DIST evolution-data-server-3.2.2.tar.xz 3730352 RMD160 72a5a0e1f697bd6ef0a6a08960fb6847e2d4d7e3 SHA1 0216a09f4792b7fcc15f2cc013849b3be233f4d0 SHA256 2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a
-EBUILD evolution-data-server-2.32.2-r1.ebuild 4150 RMD160 e6f9ece5ae709a5902438f8406466d1115816d9d SHA1 78482f64e9b3ea9c01f9140fdb24fec817614ac1 SHA256 20d91562ef3f87d947576e82e6405942fc64828e37898993032a1c98a05fad2e
-EBUILD evolution-data-server-2.32.2.ebuild 3927 RMD160 3d8501d49cdd7c23eb1cd833eed64ba038c3d9ba SHA1 dedd11c5f0eca2600cff1212ca82c269ad7988b1 SHA256 d779c226a740f32fc493e10f4f144471055cb612126aeb1d525107bdc2fd7c70
-EBUILD evolution-data-server-2.32.3-r1.ebuild 4646 RMD160 49ed0e5b6af98eb652e2ba4186a387eed3f1afd0 SHA1 da8cd64acdf024bf7b5fa2e266593383c9125bea SHA256 291fa98185af328e835c65a7ee02aeafba980b76a7eb47765c6caa5bcc96a7f4
+EBUILD evolution-data-server-2.32.2-r1.ebuild 4183 RMD160 7066ac38cb483b128d30c49e54e867be9baf1cf1 SHA1 8fd78b1ebaced2e794cf26b1d75056deb7dcc85c SHA256 f2c6795902f273ab94e4e436a6d09c3343ce8e06633a4d22597609b41ce08181
+EBUILD evolution-data-server-2.32.2.ebuild 3960 RMD160 38edf685841fb2232d8359903fa87f53997fa529 SHA1 9b24e22f3f906c5588ae50a26e921bbcc286d83a SHA256 8f779e1329a9e6b4516d3de887dbb9d6f08dbb05232623919ed099f22637fa34
+EBUILD evolution-data-server-2.32.3-r1.ebuild 4679 RMD160 98d6e8724787c5ce4a4bcc5a5f460d8207fc7659 SHA1 d220e447812971ef2250432bb28c4289232f4caa SHA256 26ae4496ffac82ce37101706a9cfc588500d812cc7fa9f03914f4b8b40c7ba11
 EBUILD evolution-data-server-3.2.1.ebuild 4212 RMD160 fa1bcbe4389685a183ee5febdb8120debb5f9b20 SHA1 b90b92e5d49065ce6ea665edc9b5da38d9d8fc3b SHA256 3b7d702270a05019f1e9fc14ad7c9eef4423b1e3492c30d66a5890853612ed19
 EBUILD evolution-data-server-3.2.2.ebuild 4212 RMD160 e12e568a4240a10171620545d44a07e42d96c708 SHA1 1fa0de4e6b3bcc7c6c3a1c1a47caedc9277400dc SHA256 bb3c5e0f44e3199b817e5c4e96040f083763b36eddfd2c3c4d6b3f2d3a1b7630
-MISC ChangeLog 61671 RMD160 6b6127ac927a33fe82eb3f5cd958c92378f049bb SHA1 f1c919435888ffb394989c4382272b0ffc924c8b SHA256 e5c654fad58bb6487cbb36a58e27ce8beb1da6bf39618d16ddecb48d2fd20d35
+MISC ChangeLog 61932 RMD160 2ae1b5498dd9956e08568cae0d3a080d175284f8 SHA1 2ea5e5d4fa19ed956a703c8a3d3881e3752cc0f3 SHA256 6d1078b7e3b4c3bafdf8fbc2ebdb7b5f5961a73774dec4924e8b375368915fb2
 MISC metadata.xml 535 RMD160 206f4b4067eab119530224247177d5f8ca6c97e2 SHA1 21a9ce92639d7c5aed6b189eca4f40b00b97778b SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7ZEccACgkQdjK8w9WeBnBufQD9ExQ0q/Xu3YsZN3e7DL28KG8O
-W4eRK7WQRXeXDC6xYw4A/iBiTUx7joAxkDwpc7/6iSnpWJApnk9d2e0bh5k+fSJj
-=G9HU
+iF4EAREIAAYFAk7fFrUACgkQdjK8w9WeBnB8AAD+Oh9LRbVKLivLjg01HteYchAA
+5ZyhJArLQmM/BYC74RMA/jCZACOjtsBpCSv+NZu+nHJERKn/qA42INm5mf3ChG5L
+=4Tuq
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild
index e5cf618ab332e5a4c910da24d60113428e533f83..7806a29aee94399764ccfcaefa9a1f8fa669ab9b 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-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/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild,v 1.8 2011/11/16 00:32:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild,v 1.9 2011/12/07 07:33:02 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -34,7 +34,9 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
        gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
        kerberos? ( virtual/krb5 )
        ldap? ( >=net-nds/openldap-2 )
-       weather? ( >=dev-libs/libgweather-2.25.4:2 )
+       weather? (
+               >=dev-libs/libgweather-2.25.4:2
+               <dev-libs/libgweather-2.91:2 )
 "
 DEPEND="${RDEPEND}
        dev-util/gperf

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild
index b5448eaf7b7008b82139d03ce4d7bfdcbc280356..5c41aa833b41f2d756840c6b8ae07d0230b615a4 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.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/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild,v 1.8 2011/11/16 00:32:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild,v 1.9 2011/12/07 07:33:02 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -33,7 +33,9 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
        ssl? (
                >=dev-libs/nspr-4.4
                >=dev-libs/nss-3.9 )
-       weather? ( >=dev-libs/libgweather-2.25.4:2 )
+       weather? (
+               >=dev-libs/libgweather-2.25.4:2
+               <dev-libs/libgweather-2.91:2 )
 "
 DEPEND="${RDEPEND}
        dev-util/gperf

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild
index 03d59069574c53e11a67e7e4059b139ced6e1e2b..e4d9b11cde3cde3c2063bd162d0c210c32f41c9e 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-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/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild,v 1.7 2011/11/16 00:32:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild,v 1.8 2011/12/07 07:33:02 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -36,7 +36,9 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
        gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
        kerberos? ( virtual/krb5 )
        ldap? ( >=net-nds/openldap-2 )
-       weather? ( >=dev-libs/libgweather-2.25.4:2 )
+       weather? (
+               >=dev-libs/libgweather-2.25.4:2
+               <dev-libs/libgweather-2.91:2 )
 "
 DEPEND="${RDEPEND}
        dev-util/gperf