Version bump with upstream fixes. Bump to eapi3, explain why some plugins are not supplied; add clutter and connman support, update default browser log message. Remove old.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 57 insertions, 40 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 56d49d91bd62..4744259c3ab7 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.310 2010/11/14 22:43:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.311 2010/11/16 19:30:29 pacho Exp $
+
+*evolution-2.32.1 (16 Nov 2010)
+
+  16 Nov 2010; Pacho Ramos <pacho@gentoo.org> -evolution-2.32.0.ebuild,
+  +evolution-2.32.1.ebuild:
+  Version bump with upstream fixes. Bump to eapi3, explain why some plugins
+  are not supplied; add clutter and connman support, update default browser
+  log message. Remove old.
 
 *evolution-2.32.0 (14 Nov 2010)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index cfe1664d6260..0f45b685a4a5 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -7,16 +7,16 @@ AUX evolution-2.32.0-wrong-lafile-usage.patch 634 RMD160 e14b9b17faacc3590419f7f
 DIST evolution-2.30.2-patches.tar.bz2 12728 RMD160 d8058da75675a1990aad84348a40cd3f7be21aa3 SHA1 4bbb89f10ba893ef992af5fc32aad84b2ad46d2f SHA256 f3d6dcfba9ee7c21b415d04a545902cb5a28d1bcc00e579c6cc78aeac7650a45
 DIST evolution-2.30.2.tar.bz2 32570501 RMD160 c1b5703bc241a2dee20f94e60e7c9995c8cce841 SHA1 14ddccbf33eb86c976899eccea6ae1fb565ea9ca SHA256 470d12c0de9cae2dc0275152a356150c7a57339e6feca77f43508bd7d1f04d83
 DIST evolution-2.30.3.tar.bz2 32555386 RMD160 b79e3f6ba181033a9add979de8b6d518d451322c SHA1 f62e1dea59243242f626cc73ffdd68df28cedd57 SHA256 8c47e93ff5aedfad39d4224ae0751a938ccb7d2a2bcd407513cf1331c51b9cab
-DIST evolution-2.32.0.tar.bz2 31877012 RMD160 4dce514b135d51e1b7fdfa3f47082ad65ab434f4 SHA1 81f5b0dab5ae00516e1ad45bd75cc174a6f57295 SHA256 61d0e45a9f23292d41155332d57d325b44b198189133b64f929cd75e1dc98841
+DIST evolution-2.32.1.tar.bz2 31875075 RMD160 f16b500474319570e6bac482f205db0d790bab28 SHA1 ade956b205dcdb1ba964554fb90be459e6908bac SHA256 6f6f904b5a2c6cf51f9c44317fc1990b07593eba54957c3924c2db0a235117a3
 EBUILD evolution-2.30.2-r1.ebuild 4662 RMD160 745c1b7789a6aa9bf64a292d52c0c167d4e66dcb SHA1 8020dc9810e74eb1d5813419d3452ed1e9b8bc4f SHA256 824a386dd0e95d4273d9975c9c1c9959371cca9dd0058b9168fffc5e0e1e76ef
 EBUILD evolution-2.30.3.ebuild 4932 RMD160 b3e547c0220034b6c4be670e43cb9eb0948b79e2 SHA1 9db1bc30ef28680930a0f51e8d0e4533c13a0417 SHA256 291a32a8b16cacc4246b6d5e2e6a909cb7657bd966348fae50acc0a9a2482588
-EBUILD evolution-2.32.0.ebuild 5143 RMD160 b37e13896f49b34642bc8a205b9e5f182d7d567e SHA1 bbf27dd83417e91eafa28a5f09167d9afbb739d1 SHA256 fd7c8b32674f1c206329aa2a3e0d3f29e7a568a95d4bb181ea2e707b987da64f
-MISC ChangeLog 72851 RMD160 2ed40e4b50091c2ab7567cc6700c3f0a4d81b0d4 SHA1 2a138c1202dcbab13b3105e38e7e60893e3003ed SHA256 4c544ddcaef62d1ca5180cdb4b9f0e4012bd9ea8faa535a266fd90ea16515d2a
-MISC metadata.xml 999 RMD160 b2e2b40520a0cc93c17457d16c130c73cb295654 SHA1 b2c3107d9eed02e9223af2f977979c7f242a7469 SHA256 673f1db6a598fa4069e4d42acaa073d60fbd6077484e3ce2d8192793bc8d75a8
+EBUILD evolution-2.32.1.ebuild 5450 RMD160 fb97e2b131f8a4da0bff9c080db2d8c9a4fc4561 SHA1 3aef620cf4a927f47708cde450b37d22f8aa7709 SHA256 cf99722efbb6cb8cbfaad316aa48d4b5b74e8ef87a2e51d1a5878d47aea38419
+MISC ChangeLog 73166 RMD160 3c289951b3d2d7b8eefd4af60f8bb452577175b1 SHA1 e04c58ec5b715a86d35f4e4f36dc00c12aaf3cb5 SHA256 595e79889fe467de6ea2244d99ddaeb04978a4768036a411d7be576775219d0d
+MISC metadata.xml 1123 RMD160 abcc4bc1f7bbc92df0e35db1b59056fe5a4d05d2 SHA1 ecc4a4f56aeb9b5d0d9ec612308d9cb1ef9f9f3d SHA256 b188965e8c8ce0823c081f8b86653e3848665eb4b0d59fee4176589b549c6911
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzgZh0ACgkQ1fmVwcYIWAZKnwCg1h66RMIKw8Oj4UvJKf73M69e
-zd0AoJ25IJGQfJ4tWyX2XN1tTsU0UtMk
-=znLn
+iEYEARECAAYFAkzi29wACgkQCaWpQKGI+9R/MQCfYZYFrtRujqEwRTYSVjzDhjQ9
+TKAAn2I8F/DDCC2Uq7RJhMzIchWAOu2R
+=2EUo
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.32.0.ebuild b/mail-client/evolution/evolution-2.32.1.ebuild
index 44eb1d1ddd2d..30107d1f5cdc 100644
--- a/mail-client/evolution/evolution-2.32.0.ebuild
+++ b/mail-client/evolution/evolution-2.32.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.0.ebuild,v 1.1 2010/11/14 22:43:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.1.ebuild,v 1.1 2010/11/16 19:30:29 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="python? 2:2.4"
 
@@ -16,20 +16,18 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 LICENSE="GPL-2 LGPL-2 OPENLDAP"
 SLOT="2.0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt doc gstreamer kerberos ldap networkmanager profile python ssl"
-# pst
-# mono - disabled because it just crashes on startup :S
+IUSE="clutter connman crypt doc gstreamer kerberos ldap networkmanager profile python ssl"
 
-# Pango dependency required to avoid font rendering problems
-# We need a graphical pinentry frontend to be able to ask for the GPG.
-# Note that separate pinenetry-qt is actually newer than USE=qt4 in pinentry.
+# We need a graphical pinentry frontend to be able to ask for the GPG
 # password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] app-crypt/pinentry[qt3] )"
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
 
-# TODO: enable champlain support
-# TODO: enable glade-3 support
+# contacts-map plugin requires libchaimplain and geoclue
+# glade-3 support is for maintainers only per configure.ac
+# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
+# pst is not mature enough and changes API/ABI frequently
 RDEPEND=">=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.20:2
+	>=x11-libs/gtk+-2.20.0:2
 	>=dev-libs/libunique-1.1.2
 	>=gnome-base/gnome-desktop-2.26:2
 	>=dev-libs/libgweather-2.25.3
@@ -40,16 +38,19 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 	>=gnome-base/gconf-2
 	>=gnome-base/libgnomecanvas-2
 	dev-libs/atk
-	>=dev-libs/dbus-glib-0.74
 	>=dev-libs/libxml2-2.7.3
 	>=net-libs/libsoup-2.4:2.4
 	>=media-gfx/gtkimageview-1.6
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
+	>=dev-libs/libgdata-0.4
 
+	clutter? ( media-libs/clutter[gtk] )
+	connman? ( net-misc/connman )
 	crypt? ( || (
-		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
-		=app-crypt/gnupg-1.4* ) )
+				  ( >=app-crypt/gnupg-2.0.1-r2
+					${PINENTRY_DEPEND} )
+				  =app-crypt/gnupg-1.4* ) )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10
 		>=media-libs/gst-plugins-base-0.10 )
@@ -61,8 +62,6 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
 		>=dev-libs/nss-3.11 )
 
 	!<gnome-extra/evolution-exchange-2.32"
-# champlain, geoclue, clutter, gtkimageview
-#	mono? ( >=dev-lang/mono-1 )
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.16
@@ -80,27 +79,29 @@ DEPEND="${RDEPEND}
 #	>=dev-util/gtk-doc-am-1.9
 
 pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 	ELTCONF="--reverse-deps"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 	G2CONF="${G2CONF}
 		--without-kde-applnk-path
 		--enable-plugins=experimental
 		--enable-image-inline
 		--enable-canberra
 		--enable-weather
-		--disable-gtk3
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
 		$(use_enable networkmanager nm)
+		$(use_enable connman)
 		$(use_enable gstreamer audio-inline)
-		--disable-pst-import
 		$(use_enable profile profiling)
+		--disable-pst-import
 		$(use_enable python)
+		$(use_with clutter)
 		$(use_with ldap openldap)
 		$(use_with kerberos krb5 /usr)
-		--disable-contacts-map"
-
-#		$(use_enable mono)
+		--disable-contacts-map
+		--without-glade-catalog
+		--disable-mono
+		--disable-gtk3"
 
 	# 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
@@ -118,19 +119,21 @@ 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
 }
 
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix invalid use of la file in contact-editor
+	# Fix invalid use of la file in contact-editor, upstream bug #635002
 	epatch "${FILESDIR}/${PN}-2.32.0-wrong-lafile-usage.patch"
 
-	# FIXME: Fix compilation flags crazyness
-	sed -e 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
-		-i configure.ac configure || die "sed 1 failed"
-
 	# Use NSS/NSPR only if 'ssl' is enabled.
 	if use ssl ; then
 		sed -e 's|mozilla-nss|nss|' \
@@ -138,6 +141,10 @@ src_prepare() {
 			-i configure.ac configure || die "sed 2 failed"
 	fi
 
+	# Fix compilation flags crazyness
+	sed -e 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
+		-i configure.ac configure || die "sed 1 failed"
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
@@ -155,10 +162,10 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 
 	elog "To change the default browser if you are not using GNOME, do:"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'firefox %s'"
+	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'firefox %s'"
 	elog ""
-	elog "Replace 'mozilla %s' with which ever browser you use."
+	elog "Replace 'firefox %s' with which ever browser you use."
 	elog ""
 	elog "Junk filters are now a run-time choice. You will get a choice of"
 	elog "bogofilter or spamassassin based on which you have installed"
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index 488280de5867..19cf151c7cc8 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -3,6 +3,9 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
+		<flag name="clutter">Build with clutter support for animation effects</flag>
+		<flag name="connman">Enable <pkg>net-misc/connman</pkg>	support (requires 
+		'networkmanager' USE flag to be disabled).</flag>
 		<flag name="crypt">Enable GPG encryption support using
 			<pkg>app-crypt/gnupg</pkg> and <pkg>app-crypt/pinentry</pkg></flag>
 		<flag name="ldap">Enable support for fetching contacts from an LDAP or
@@ -10,7 +13,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="pst">Build optional plugin for PST file format import</flag> -->
 		<flag name="pda">Enable support for syncing Evolution Calendar and
 			Addressbooks with PDAs using <pkg>app-pda/gnome-pilot</pkg> and
 			<pkg>app-pda/gnome-pilot-conduit</pkg></flag>