Make weather support optional to allow evolution-3 to be installed on gnome-2 (bug #454548, thanks to Tomáš Bžatek).

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 40 insertions, 39 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 625a160b0aab..c68d6cc4305e 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.385 2013/02/07 22:24:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.386 2013/02/10 20:49:08 tetromino Exp $
+
+  10 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-3.4.4.ebuild, evolution-3.6.2-r1.ebuild, evolution-3.6.3.ebuild,
+  metadata.xml:
+  Make weather support optional to allow evolution-3 to be installed on gnome-2
+  (bug #454548, thanks to Tomáš Bžatek).
 
   07 Feb 2013; Ulrich Müller <ulm@gentoo.org> evolution-3.4.4.ebuild,
   evolution-3.6.2-r1.ebuild, evolution-3.6.3.ebuild:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index aadf968fd2b1..20812cc1830d 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -15,25 +15,19 @@ DIST evolution-3.6.2-gentoo-patches.tar.xz 20740 SHA256 0f69f5355d07d0e80f027955
 DIST evolution-3.6.2.tar.xz 12006684 SHA256 40b326c63abc33ccc1393c9e3b60c747234ab14a46fc4690255b523942ea8983 SHA512 31299782e7e8dcdd7002fc81425fc19fd4af221a734d8fdcee652b38d41745e7817bf48e53707157fe7e88f46aa02c79b7024c8e30ecdbd7755587abc03191a9 WHIRLPOOL 794091d521615060ab05b8191b4154a39f501d244b39c6e2a46d0de68631b582839c93b85ab99484b8247de3749ceb02eb471290fb5b266aa67ed0d645d630ed
 DIST evolution-3.6.3.tar.xz 12396872 SHA256 2c564f3e59cb26663d3e3992c881842815fb8fbc037074475f906030c8c5fd25 SHA512 cc2c47d844b5745f6b3632450b91a56b5aad652ce14c796f3f56a99dd52c80b2ccae1ab8fe2d5832022c0e8b1e5529f9bf38fe5efd2d2c5c24ef82d7acae1a27 WHIRLPOOL 43465c0805b019b5f174ad2f5605d5662c2657541452bd271dbf12c4fa95338308e3d968b28ee29d155a202ed9e3d6b085edfd6f43f92576173b117492828506
 EBUILD evolution-2.32.3-r1.ebuild 6064 SHA256 285087f4807086ca3fb07c3047575d3696aa9e3e31ea7ac81d2b6104f129b948 SHA512 89618829feb441a3da7b86a330cde83de1fb9442a2e388d31b73fcf42b7561c2794800dcf952387d68a668d75ec8ec73098e82b33711aacbb9dad5b6d5171c30 WHIRLPOOL 9705e94846e1239a2c660e114c97cb64f0c27a3fcf997f67ad48711a502236a2e3701ef89f941245ec946bbf6841c1d57178ef6193f45210704a9fead6c73fca
-EBUILD evolution-3.4.4.ebuild 5596 SHA256 c3c28eec4b87f7fe9ea9156b54b8deb1abf19d2bb09b6cc9719a55c84b012e38 SHA512 2d5d376d8061fa68735270d408c8a900172848ffffa3076de87b31b96d27902351a9670453493eb1c05ca81413ac55700437fc97c63608c053a85c28d5e5d941 WHIRLPOOL 1ad6fe98d751d03ac276cd0ce72213f26af9a9897e9816a882305978ec2c9f8f828ae4aa5ffd1b61eccfd916e3992c538fc56eaddee0856573f5e16e063bb560
-EBUILD evolution-3.6.2-r1.ebuild 5001 SHA256 3971eeeb13fe329a8648c7e5f3c40004d5f8d708e02fe302c0bc37d01409b58f SHA512 24a9122e052d7b697eb5e9c168c76e38fd5281c3c9cb69830d608f9848a6ea0215f5d0e28cb4aca57c38a07df344520f2c73391a4cd7ab2b71cc34f75b823671 WHIRLPOOL 9e3f970f899277df49a26646edab40a5911d4ea778aee35721404d401d7d5535c89035397c19c3e981f1a86d9a23e786e057e64d9c82183928b70f06b08965c0
-EBUILD evolution-3.6.3.ebuild 4776 SHA256 34b0cfbacdb01109657d348e90977fae698d43dcb2cbba69e0d65383f59eb33d SHA512 8f8f769c6ec9691b6a130fef08d8cb0a8d9cb6425051675592bfa1177b0c52387147b6556538443ee919a808ecf7825585700ab7e2de0d04ee779c6e7e0738db WHIRLPOOL 0e91de6746ac28199deba3bc07cc29fddf7ed4ff113ab5ea4b4b8e4b08b0e667b1b24f42246a802c6cefd2076dd0dd31e8d24cfcbb0e71c8843cf544d2db4f4b
-MISC ChangeLog 86476 SHA256 379285749fbaab77a7a5db918fc161bfb0014983c562099847f23519c9921d6d SHA512 2b043efbf493186908ffef4dbcfc888d60cc57abe84ee724923947795cc629862b77e0df5c653f8a0ecee5285da6db01304fd4b614ba0ac309de582e030c47b2 WHIRLPOOL 119a7f1d5536b10b565dcd8beb439b958aad8b52499e77d2e07d0240552be67d91a51eb912372608bfde8c190dbf8fdf34eacf7df953b2fbe8e3cf6fcf6de627
-MISC metadata.xml 1097 SHA256 fd96c4817ed5c032a35790835aa072abbee8188b443e43f591badb35f8b38147 SHA512 7214c362d0304fe50699b9b9489155e6d3c1b8a85e0d625e733ad036837938ed844e9ed0b25743252946ceb891a9db3db1580738f4312ba4056c88c2ba35a2a1 WHIRLPOOL a80537a65b1dbf887b49c02aa9d9182ed91bc87a7674f48d33c6178c14c206f7dfaa314970a62e4da83417c3d8271e4f47eeab222c4fa2b8f737f243811c1d6d
+EBUILD evolution-3.4.4.ebuild 5630 SHA256 88ffc04c0fb86e96d9e224fc0f69fc5b82274e421505b31e8a8aa197904804dd SHA512 db522262b8a40eab050f788790bc390a35d2a1b89e13878852cac2b9f85b9261fd8dc8f60f37224a9c21999175f50e70911b3ec81078b9f69576975b3597988f WHIRLPOOL 9228a3530f858898a9223011939c1cfbeaa3e9bc9c9951eaf2b47885874eaa5696f974ed46d768bf0e77020c9c11050edc4e05a802142c04d2026c1d0c0de331
+EBUILD evolution-3.6.2-r1.ebuild 5035 SHA256 567603841355708d99e12bd6f9970e70602ed799db3e35819e41a2242576857b SHA512 6f18afac64929830d39da73bbdeedc872de134e5ce785cdf2411c79327484e26b71867f8270fb9b2fd7dd6d111cd0b141531c60a4805fee299189e7db2e0db8a WHIRLPOOL e6191dad011f7bf2f914240ba1da9fb679ee236963c366d84b583ec0c829c0827b6cf872d3aeb16a73bf217f996fa239588041d31ff03d79c09e7bfea284d422
+EBUILD evolution-3.6.3.ebuild 4810 SHA256 89df750c3f42d329a8d78d8d870ceaa27ff82b4bde1f36419697741ac9f7f1b5 SHA512 5ff0f555073348ddd623f5cbef742f67bc3c608e5fbd44fe5946d1b9e2229722be86c426266e48138043635d2724df7d2980e777590f17393e8322d2d55abc1d WHIRLPOOL 18ca17ff10b9c3ead02c2da0c8fd6a948a61efd0092b24a27e64ee7f6c5167e5eb214c5a90100d4fe89115d0209f51c7eb702a01a8abb29cbe593ff399f50983
+MISC ChangeLog 86759 SHA256 327a75dc6ffe6934f636cf684dabe0b45bc55094088d0689731083c1f6b55383 SHA512 dc48b8e9ed2876ab885f7261b2b105fa14ec8161bf1a2ac9fce6ffb423e7736d8c12b12b7210ecff491a0e065c144d55eafd0db16f9a80ccce42b6cb62953226 WHIRLPOOL 3c7b3196836c83344983ca91f8391877e386c4cace082931fc7515b271e1b6bfe218f848c8f66399e0f1aa3d05e16a71f2ed4ec7f38a6c8bae71e447e43b79f1
+MISC metadata.xml 1168 SHA256 03bfc4c9af3441996a2bdde666ad2d70e489e4d8897072864e10745979a5289d SHA512 adac65bf74736484d3a2c6272b92eb1b949924fc3587644f7e717204698fc862554b79014854ea2f2ec0e5ca17ea9e3f003ebbfec1e2df4ca67a308841905ce6 WHIRLPOOL fdc69e078f54d48b000dc5762b83c5ac2a1ad7eb644c45a98d51d560989894585347574f6ba4d155c61d80d442c2922a56eac5f24fc97ad0da18ad819f3abd2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFCqdAAoJEDxpGckxwJCBtgoP/j8Oj43Ku2VWhHtN/ZzbQuw/
-l2/N8KuvaN2p0j0ScMNO5gHGrsatttluXhhWbtGHoUsGyyXHBoHit8zMJyz16Q+l
-Au/udfLOfTGEMdXavit4ysVF/Q7UUm29kPrJYUXsLSqvyyzITCOIiLVs3TosZwBq
-zTcJ//GIdO5XuO34E/BQRuFh39852eb0K5WyEV3Cy9lqilACrPu8spAQ0d9VPssB
-TkyMPPc5cwpi+K77cG0rdnp1M5PKTlUvvkT4wOlQoUkxHR8W6BlAyi/0WTrxRimO
-gj+k4sQV6P1lt0WPDgC5CoicKTT2LzOYBK7TKbrluU/xXRUw0DRbyhoviAlxinDP
-KYR8Vu/L21+mHZIPpXcVWu+ZlQErz4Mi7jahd+0FMHtqxXk6s0BaBUAH5J/UaEiF
-VNINleqsLsxHDj1oC+vRafCVoLO/s5rXKoiENiur2bHUdktmEC+7UFNi1eTJ1dLs
-rWm9oVemxnxkQ/fLTPAcEZ/ibBuyrdOqr+lTGf8JuEvLrIdzif/8y5pFUqDpvZke
-lZYMXwgPJhCPtBtCMqsIbqhkCCzJpA83pRAft/dflpSrgm+MYHxkkx8UtRHFt4Sh
-acsSUhPI7kTI3YDNnkbvG3bW06CHqftVgNGs3ta8dOfsOTHsys4FQB/wsoK/MkdR
-o6MCSKL6mpu39ATGPDJS
-=aOLh
+iQEcBAEBCAAGBQJRGAfGAAoJEJ0WA1zPCt1hCBMH/ilmpk6PhMsD4PaxqPvG4pr5
+4m0LUqSzuzdLvr36HMVOELC6n7LenLa5UVjiz8A3ADHJPLOyagzZ4bWkQEdrD8VF
+U+fLEjKalvE5wOXu+sFilAFxZbGzPGlQyM5vM3QsTNmtKXR2WcuQLtEKOzkYQHvD
+N93peEdi3J9fDt9XUnkBYKxWiT4PIbFLlhEYlVSqg1LuCp90L/K29u3Ob0lNSJQQ
+Gm1OuSF2xFCFiK2e2p7OLzE10G7csOfitkUK5n75iDvL6ybAUDRpCspzJRSW7owt
+QX+ALb9GFVEb2Ck+vxRdn10KMzqu8cOdtOI4ydXo3qAJSGceAqg6I3Z5HRBfMz0=
+=4ihO
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.4.4.ebuild b/mail-client/evolution/evolution-3.4.4.ebuild
index 474b1dca6990..41eb3a9c16af 100644
--- a/mail-client/evolution/evolution-3.4.4.ebuild
+++ b/mail-client/evolution/evolution-3.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.4.4.ebuild,v 1.8 2013/02/07 22:24:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.4.4.ebuild,v 1.9 2013/02/10 20:49:08 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -18,7 +18,7 @@ HOMEPAGE="http://projects.gnome.org/evolution/"
 LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
 SLOT="2.0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="clutter connman crypt +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl"
+IUSE="clutter connman crypt +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl +weather"
 
 # We need a graphical pinentry frontend to be able to ask for the GPG
 # password from inside evolution, bug 160302
@@ -32,10 +32,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 	>=x11-libs/gtk+-3.4:3
 	>=gnome-base/gnome-desktop-2.91.3:3
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=dev-libs/libgweather-2.90.0:2
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7
-	>=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather]
+	>=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather?]
 	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=gnome-extra/gtkhtml-4.1.2:4.0
 	>=gnome-base/gconf-2:2
@@ -70,7 +69,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	ssl? (
 		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )"
+		>=dev-libs/nss-3.11 )
+	weather? ( >=dev-libs/libgweather-2.90.0:2 )"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=app-text/gnome-doc-utils-0.20.10
@@ -109,7 +109,6 @@ src_prepare() {
 		--disable-mono
 		--disable-pst-import
 		--enable-canberra
-		--enable-weather
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
 		$(use_enable networkmanager nm)
@@ -121,7 +120,8 @@ src_prepare() {
 		pythonpath=$(PYTHON -2 -a)
 		$(use_with clutter)
 		$(use_with ldap openldap)
-		$(use_with kerberos krb5 ${EPREFIX}/usr)"
+		$(use_with kerberos krb5 ${EPREFIX}/usr)
+		$(use_enable weather)"
 
 	# dang - I've changed this to do --enable-plugins=experimental.  This will
 	# autodetect new-mail-notify and exchange, but that cannot be helped for the
diff --git a/mail-client/evolution/evolution-3.6.2-r1.ebuild b/mail-client/evolution/evolution-3.6.2-r1.ebuild
index 041852f2179e..126f37137095 100644
--- a/mail-client/evolution/evolution-3.6.2-r1.ebuild
+++ b/mail-client/evolution/evolution-3.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.6.2-r1.ebuild,v 1.8 2013/02/07 22:24:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.6.2-r1.ebuild,v 1.9 2013/02/10 20:49:08 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI}
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
 LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
 SLOT="2.0"
-IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl"
+IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl +weather"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 # We need a graphical pinentry frontend to be able to ask for the GPG
@@ -33,10 +33,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.32:2
 	>=x11-libs/gtk+-3.4.0:3
 	>=gnome-base/gnome-desktop-2.91.3:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=dev-libs/libgweather-3.5.0:2=
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7:=
-	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather]
+	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
 	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=gnome-extra/gtkhtml-4.5.2:4.0
 	dev-libs/atk
@@ -70,7 +69,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.32:2
 		>=media-libs/libchamplain-0.12:0.12 )
 	ssl? (
 		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )"
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.5.0:2= )"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/gtk-doc-am
@@ -97,14 +97,14 @@ src_prepare() {
 		--disable-image-inline
 		--disable-pst-import
 		--enable-canberra
-		--enable-weather
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable gstreamer audio-inline)
 		$(use_enable map contact-maps)
 		$(use_with ldap openldap)
-		$(use_with kerberos krb5 ${EPREFIX}/usr)"
+		$(use_with kerberos krb5 ${EPREFIX}/usr)
+		$(use_enable weather)"
 
 	# Use NSS/NSPR only if 'ssl' is enabled.
 	if use ssl ; then
diff --git a/mail-client/evolution/evolution-3.6.3.ebuild b/mail-client/evolution/evolution-3.6.3.ebuild
index 3df9a2e99b89..91aa5674f55a 100644
--- a/mail-client/evolution/evolution-3.6.3.ebuild
+++ b/mail-client/evolution/evolution-3.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.6.3.ebuild,v 1.2 2013/02/07 22:24:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.6.3.ebuild,v 1.3 2013/02/10 20:49:08 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ HOMEPAGE="http://projects.gnome.org/evolution/"
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
 LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
 SLOT="2.0"
-IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl"
+IUSE="crypt +gnome-online-accounts gstreamer kerberos ldap map ssl +weather"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 # We need a graphical pinentry frontend to be able to ask for the GPG
@@ -31,10 +31,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.32:2
 	>=x11-libs/gtk+-3.4.0:3
 	>=gnome-base/gnome-desktop-2.91.3:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=dev-libs/libgweather-3.5.0:2=
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7:=
-	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather]
+	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
 	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=gnome-extra/gtkhtml-4.5.2:4.0
 	dev-libs/atk
@@ -68,7 +67,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.32:2
 		>=media-libs/libchamplain-0.12:0.12 )
 	ssl? (
 		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )"
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.5.0:2= )"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/gtk-doc-am
@@ -112,7 +112,6 @@ src_configure() {
 		--disable-image-inline \
 		--disable-pst-import \
 		--enable-canberra \
-		--enable-weather \
 		$(use_enable ssl nss) \
 		$(use_enable ssl smime) \
 		$(use_enable gnome-online-accounts goa) \
@@ -124,6 +123,7 @@ src_configure() {
 			--without-nspr-includes
 			--without-nss-libs
 			--without-nss-includes") \
+		$(use_enable weather) \
 		ITSTOOL=$(type -P true)
 }
 
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index 303024bbcab4..a050b85f6ffd 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -17,5 +17,6 @@
 		<flag name="networkmanager">Allows Evolution to automagically toggle
 			online/offline mode by talking to <pkg>net-misc/networkmanager</pkg>
 			and getting the current network state</flag>
+		<flag name="weather">Enable optional weather calendar support</flag>
 	</use>
 </pkgmetadata>