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

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 28 insertions, 21 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/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>