[gentoo-commits] gentoo-x86 commit in mail-client/evolution: ChangeLog evolution-2.32.2-r3.ebuild

["Pacho Ramos (pacho)" <pacho@gentoo.org>]

pacho       11/06/26 16:32:13

  Modified:             ChangeLog evolution-2.32.2-r3.ebuild
  Log:
  Disable connman in stable candidate as it is not ready to stabilize yet.
  
  (Portage version: 2.1.9.50/cvs/Linux x86_64)

Revision  Changes    Path
1.338                mail-client/evolution/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?rev=1.338&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?rev=1.338&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/ChangeLog?r1=1.337&r2=1.338

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- ChangeLog	19 Jun 2011 21:35:48 -0000	1.337
+++ ChangeLog	26 Jun 2011 16:32:13 -0000	1.338
@@ -1,6 +1,9 @@
 # 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.337 2011/06/19 21:35:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.338 2011/06/26 16:32:13 pacho Exp $
+
+  26 Jun 2011; Pacho Ramos <pacho@gentoo.org> evolution-2.32.2-r3.ebuild:
+  Disable connman in stable candidate as it is not ready to stabilize yet.
 
 *evolution-2.32.3 (19 Jun 2011)
 



1.2                  mail-client/evolution/evolution-2.32.2-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild?r1=1.1&r2=1.2

Index: evolution-2.32.2-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.32.2-r3.ebuild	12 Apr 2011 11:14:26 -0000	1.1
+++ evolution-2.32.2-r3.ebuild	26 Jun 2011 16:32:13 -0000	1.2
@@ -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.1 2011/04/12 11:14:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild,v 1.2 2011/06/26 16:32:13 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -18,7 +18,7 @@
 LICENSE="GPL-2 LGPL-2 OPENLDAP"
 SLOT="2.0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="clutter connman crypt doc gstreamer kerberos ldap networkmanager python ssl"
+IUSE="clutter crypt doc gstreamer kerberos ldap networkmanager python ssl"
 
 # We need a graphical pinentry frontend to be able to ask for the GPG
 # password from inside evolution, bug 160302
@@ -47,7 +47,6 @@
 	>=dev-libs/libgdata-0.4
 
 	clutter? ( media-libs/clutter:1.0[gtk] )
-	connman? ( net-misc/connman )
 	crypt? ( || (
 				  ( >=app-crypt/gnupg-2.0.1-r2
 					${PINENTRY_DEPEND} )
@@ -91,7 +90,6 @@
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
 		$(use_enable networkmanager nm)
-		$(use_enable connman)
 		$(use_enable gstreamer audio-inline)
 		--disable-profiling
 		--disable-pst-import
@@ -102,7 +100,8 @@
 		--disable-contacts-map
 		--without-glade-catalog
 		--disable-mono
-		--disable-gtk3"
+		--disable-gtk3
+		--disable-connman"
 
 	# 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
@@ -120,12 +119,6 @@
 			--without-nss-includes"
 	fi
 
-	# NM and connman support cannot coexist
-	if use networkmanager && use connman ; then
-		ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..."
-		G2CONF="${G2CONF} --disable-connman"
-	fi
-
 	python_set_active_version 2
 }