diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2011-06-26 16:32:13 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2011-06-26 16:32:13 +0000 |
| commit | 496f2f8c90dd6753c3de938c2f18262f2920497d (patch) | |
| tree | 2d4accfe50f7a072591f0c9c4e0db1cbb97c229d /mail-client/evolution | |
| parent | x86 stable wrt security bug #372891 (diff) | |
| download | gentoo-2-496f2f8c90dd6753c3de938c2f18262f2920497d.tar.gz gentoo-2-496f2f8c90dd6753c3de938c2f18262f2920497d.tar.bz2 gentoo-2-496f2f8c90dd6753c3de938c2f18262f2920497d.zip | |
Disable connman in stable candidate as it is not ready to stabilize yet.
(Portage version: 2.1.9.50/cvs/Linux x86_64)
Diffstat (limited to 'mail-client/evolution')
| -rw-r--r-- | mail-client/evolution/ChangeLog | 5 | ||||
| -rw-r--r-- | mail-client/evolution/evolution-2.32.2-r3.ebuild | 15 |
2 files changed, 8 insertions, 12 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog index 430fd8b1a50c..bf984d0498e3 100644 --- a/mail-client/evolution/ChangeLog +++ b/mail-client/evolution/ChangeLog @@ -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) diff --git a/mail-client/evolution/evolution-2.32.2-r3.ebuild b/mail-client/evolution/evolution-2.32.2-r3.ebuild index 12003ba5a692..81ba94069abf 100644 --- a/mail-client/evolution/evolution-2.32.2-r3.ebuild +++ b/mail-client/evolution/evolution-2.32.2-r3.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/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 @@ SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches-r1.tar.bz2" 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 @@ RDEPEND=">=dev-libs/glib-2.25.12:2 >=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 @@ pkg_setup() { $(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 @@ pkg_setup() { --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 @@ pkg_setup() { --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 } |