Diff from evolution-3.6.3.ebuild

evo.diff (text/plain), 1.80 KB, created by Tomáš Bžatek on 2013-01-29 15:53:37 UTC

--- evolution-3.6.3.ebuild	2013-01-22 04:48:11.000000000 +0100
+++ evolution-3.6.3-r1.ebuild	2013-01-29 16:51:19.000000000 +0100
@@ -16,7 +16,7 @@
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
 LICENSE="|| ( LGPL-2 LGPL-3 ) CCPL-Attribution-ShareAlike-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 @@
 	>=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 @@
 		>=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 @@
 		--disable-image-inline \
 		--disable-pst-import \
 		--enable-canberra \
-		--enable-weather \
 		$(use_enable ssl nss) \
 		$(use_enable ssl smime) \
 		$(use_enable gnome-online-accounts goa) \
@@ -120,6 +119,7 @@
 		$(use_enable map contact-maps) \
 		$(use_with ldap openldap) \
 		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_enable weather weather) \
 		$(usex ssl --enable-nss=yes "--without-nspr-libs
 			--without-nspr-includes
 			--without-nss-libs