Bump to 3.2.2 with assorted bugfixes. Drop old.

Also, QA: eautoreconf should be before gnome2_src_prepare.

(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)

5 files changed, 39 insertions, 35 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 98ec44ab65c9..82652d375187 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,14 @@
 # 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.350 2011/10/31 07:35:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.351 2011/11/16 00:33:22 tetromino Exp $
+
+*evolution-3.2.2 (16 Nov 2011)
+
+  16 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-2.32.2-r3.ebuild, evolution-2.32.3.ebuild,
+  evolution-2.32.3-r1.ebuild, -evolution-3.0.3.ebuild, +evolution-3.2.2.ebuild:
+  Bump to 3.2.2 with assorted bugfixes. Drop old.
+  Also, QA: eautoreconf should be before gnome2_src_prepare.
 
 *evolution-3.2.1 (31 Oct 2011)
 
diff --git a/mail-client/evolution/evolution-2.32.2-r3.ebuild b/mail-client/evolution/evolution-2.32.2-r3.ebuild
index 00eb8435b387..a6f69f4f71ec 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.7 2011/10/31 07:35:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.2-r3.ebuild,v 1.8 2011/11/16 00:33:22 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -126,8 +126,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch
 
 	# Fix invalid use of la file in contact-editor, upstream bug #635002
@@ -155,6 +153,7 @@ src_prepare() {
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+	gnome2_src_prepare
 }
 
 src_install() {
diff --git a/mail-client/evolution/evolution-2.32.3-r1.ebuild b/mail-client/evolution/evolution-2.32.3-r1.ebuild
index bbd27912472b..afc7ec74c94b 100644
--- a/mail-client/evolution/evolution-2.32.3-r1.ebuild
+++ b/mail-client/evolution/evolution-2.32.3-r1.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.3-r1.ebuild,v 1.2 2011/10/31 07:35:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.3 2011/11/16 00:33:22 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -134,8 +134,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch
 
 	# Fix invalid use of la file in contact-editor, upstream bug #635002
@@ -163,6 +161,7 @@ src_prepare() {
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+	gnome2_src_prepare
 }
 
 pkg_postinst() {
diff --git a/mail-client/evolution/evolution-2.32.3.ebuild b/mail-client/evolution/evolution-2.32.3.ebuild
index 1c0af7aa2534..feda8bd3b8ec 100644
--- a/mail-client/evolution/evolution-2.32.3.ebuild
+++ b/mail-client/evolution/evolution-2.32.3.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.3.ebuild,v 1.7 2011/10/31 07:35:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3.ebuild,v 1.8 2011/11/16 00:33:22 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -127,8 +127,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch
 
 	# Fix invalid use of la file in contact-editor, upstream bug #635002
@@ -156,6 +154,7 @@ src_prepare() {
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+	gnome2_src_prepare
 }
 
 pkg_postinst() {
diff --git a/mail-client/evolution/evolution-3.0.3.ebuild b/mail-client/evolution/evolution-3.2.2.ebuild
index d48a103ba8dd..fe924aee6e6a 100644
--- a/mail-client/evolution/evolution-3.0.3.ebuild
+++ b/mail-client/evolution/evolution-3.2.2.ebuild
@@ -1,14 +1,13 @@
 # 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-3.0.3.ebuild,v 1.2 2011/10/31 07:35:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.2.ebuild,v 1.1 2011/11/16 00:33:22 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="xz"
 PYTHON_DEPEND="python? 2:2.4"
 
-inherit flag-o-matic gnome2 python
+inherit autotools eutils flag-o-matic gnome2 python
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="http://www.gnome.org/projects/evolution/"
@@ -16,7 +15,7 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 LICENSE="GPL-2 LGPL-2 OPENLDAP"
 SLOT="2.0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="clutter connman crypt doc gstreamer kerberos ldap map networkmanager python ssl"
+IUSE="clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl"
 
 # We need a graphical pinentry frontend to be able to ask for the GPG
 # password from inside evolution, bug 160302
@@ -29,20 +28,20 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 COMMON_DEPEND=">=dev-libs/glib-2.28:2
 	>=x11-libs/cairo-1.9.15[glib]
 	>=x11-libs/gtk+-3.0.2:3
-	>=dev-libs/libunique-2.91.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}[weather]
-	>=gnome-extra/gtkhtml-3.31.3:4.0
+	>=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather]
+	>=gnome-extra/gtkhtml-4.1.2:4.0
 	>=gnome-base/gconf-2:2
 	dev-libs/atk
 	>=dev-libs/libxml2-2.7.3:2
 	>=net-libs/libsoup-gnome-2.31.2:2.4
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.4
+	>=dev-libs/libgdata-0.9.1
 
 	x11-libs/libSM
 	x11-libs/libICE
@@ -55,6 +54,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
 	crypt? ( || (
 		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
 		=app-crypt/gnupg-1.4* ) )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10:0.10
 		>=media-libs/gst-plugins-base-0.10:0.10 )
@@ -62,7 +62,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
 	ldap? ( >=net-nds/openldap-2 )
 	map? (
 		>=app-misc/geoclue-0.11.1
-		media-libs/libchamplain:0.8 )
+		media-libs/libchamplain:0.10 )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	ssl? (
 		>=dev-libs/nspr-4.6.1
@@ -84,9 +84,11 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/evolution-exchange-2.32"
 
-# Need EAPI=4 support in python eclass
-#REQUIRED_USE="map? ( clutter )
-#	^^ ( connman networkmanager )"
+# contact maps require clutter
+# NM and connman support cannot coexist
+REQUIRED_USE="map? ( clutter )
+	connman? ( !networkmanager )
+	networkmanager? ( !connman )"
 
 pkg_setup() {
 	ELTCONF="--reverse-deps"
@@ -98,7 +100,6 @@ pkg_setup() {
 		--enable-plugins=experimental
 		--disable-image-inline
 		--disable-mono
-		--disable-profiling
 		--disable-pst-import
 		--enable-canberra
 		--enable-weather
@@ -106,12 +107,13 @@ pkg_setup() {
 		$(use_enable ssl smime)
 		$(use_enable networkmanager nm)
 		$(use_enable connman)
+		$(use_enable gnome-online-accounts goa)
 		$(use_enable gstreamer audio-inline)
-		$(use_enable map contacts-map)
+		$(use_enable map contact-maps)
 		$(use_enable python)
 		$(use_with clutter)
 		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)"
+		$(use_with kerberos krb5 ${EPREFIX}/usr)"
 
 	# 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
@@ -129,22 +131,19 @@ pkg_setup() {
 			--without-nss-includes"
 	fi
 
-	# NM and connman support cannot coexist
-	# XXX: remove with EAPI 4
-	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
+	python_pkg_setup
 }
 
 src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch"
+	eautoreconf
+
 	gnome2_src_prepare
 
 	# Fix compilation flags crazyness
-	# Note: sed configure.ac if eautoreconf
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS"/\1/' \
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
 		-i configure || die "CPPFLAGS sed failed"
 }