Bump to 3.2.2 with assorted bugfixes. Drop old.

Also, QA: eautoreconf should be before gnome2_src_prepare.

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

6 files changed, 48 insertions, 44 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/Manifest b/mail-client/evolution/Manifest
index e189b3487b6f..65ef0a4b3895 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -10,19 +10,19 @@ DIST evolution-2.32.2-patches-r1.tar.bz2 15387 RMD160 1b5279f83c5d6048294a4b320b
 DIST evolution-2.32.2.tar.bz2 31929154 RMD160 1d68825111309600093c8d4718e1cc001635e61d SHA1 48f25fffda1ac9c209fd02162ca298df5c03b05f SHA256 1831c7f5f00b4755869cf84ef3e3f79c4705a33e0659e72b6c1ffa4a59d4a4bb
 DIST evolution-2.32.3-patches.tar.xz 11784 RMD160 34e536268814b2c41fd081321f3435ea10af620c SHA1 2f9af7d7f9489099daefceb7ea7f2948fa1314a5 SHA256 eadfcd9d1663206f1d15457358afa7901f095894d782d4043ffd762b242eded6
 DIST evolution-2.32.3.tar.bz2 31966138 RMD160 1b64d00a38cf8ad5c273cc4f4aee73124fe818af SHA1 cc2a2126ef4192193dce50c43c5bb6fc0a57fcde SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb
-DIST evolution-3.0.3.tar.xz 25755880 RMD160 0cf0457ac4654e277cff0e174d29cc3dc96e0924 SHA1 c0ea8a8551e1937f5ede665d0a34ff8ea773d839 SHA256 37fadcd459b74960fccf805f627ff869e315367690af8809ce956ec7e23294f7
 DIST evolution-3.2.1.tar.xz 11472552 RMD160 32ae1274c938627df2ae971b244e3a65968a1eb9 SHA1 3e74817a299adb5830cc076094e9f7fe74a0a1c1 SHA256 244d4fcf57d59b3fe0bcedddc65da5f508b253cb64159e6ddb2bddedf8d7e19a
-EBUILD evolution-2.32.2-r3.ebuild 5654 RMD160 46af147b3192f290dc2472bbf15c559024300e55 SHA1 ac29a4c7c11c1304742b817f3fb1d058778bf9ae SHA256 bde531ffbbf6310b3d6e6ecf610ae1ed3ec4fd80f1a1563c4b58576ed4928f08
-EBUILD evolution-2.32.3-r1.ebuild 5792 RMD160 c3c12978d1cd4f7934b82b295f343cbf9ee236a7 SHA1 21e1e52e89402c305264515663bea91472aa1b94 SHA256 c03d2bc14217600c2d1460cf96484dfd00ea2792dfcc8cb9aa6d1f00432e3ee0
-EBUILD evolution-2.32.3.ebuild 5516 RMD160 b69b8d0a635f9139f7d4b000899e9e8a44c57165 SHA1 29fb979aeae93033f730ec43bbd43c150533ea3a SHA256 eec74965763fc67d48ad3e7fff6fdc82fbeaeda07ae8990142ebf5cc8024c0ed
-EBUILD evolution-3.0.3.ebuild 5278 RMD160 49024daabeda81845380959879330cd7fab9ad63 SHA1 8d83709999883511e0813957c694c77a126d116e SHA256 8a50d0f87adcc1a1d66f024dea53d68f079a3430a18b6931bf57463ba5d19d91
+DIST evolution-3.2.2.tar.xz 11489564 RMD160 494db8147be89f62a337dcd357c3ba0eabc1047b SHA1 cae31984cfbcd26a8848a7b94a0f4957502ae173 SHA256 03c68242bbf494dda3bf34f52ec843c282c9bb07f9415a69fe58237c7efbbe7d
+EBUILD evolution-2.32.2-r3.ebuild 5653 RMD160 52fd96ac8254f310c0e5a078d5b6480887638b65 SHA1 092619b005c59d71a5963cf2fee6b836a8b25f54 SHA256 ab15b580837e215876c5b628087f24ad731b59693d207bc8d6ab25ede1d7b407
+EBUILD evolution-2.32.3-r1.ebuild 5791 RMD160 d84afda28cacc6b0845d10a34b1be77245f4df8f SHA1 e950a0b6792969adf903639faca706423dcaa4a2 SHA256 9807e61004c5f7baeed20f0b35a01a7cc2e56a22aadba1c0dbb748ec0f967bb4
+EBUILD evolution-2.32.3.ebuild 5515 RMD160 cd24a25537b3ccc1ced1f919140a9b03989fa2a4 SHA1 0274116b70817f148fc9acd021d990f9f8ad1d81 SHA256 ba5dcb05db7dbaab73c2bad4aa20c401ac5577f34a0f890f25f0ff4deb5230bd
 EBUILD evolution-3.2.1.ebuild 5368 RMD160 56fc0308b83a6b74ed2564ada2e0f01bd90a1dfd SHA1 41705a4de148ba84e939f1594ef518d83b33dd22 SHA256 1bc4892b7a7dd63bfe4524c049a9ef145e544979efd5c12e1a5469acde2e1fa9
-MISC ChangeLog 79817 RMD160 6952e41a72c1b8ddefaaa5c8729d9f3417619e9f SHA1 fb12ad872050ce0a8bd0ba1f51d9b3e9cf43e628 SHA256 d0dda13aff6c0f7a5b3c6e93a5ae5b0f618bb3884a820457ecd8b9062f0b0d08
+EBUILD evolution-3.2.2.ebuild 5368 RMD160 cdd206878f7ee5495e12501f69c479cddd7e89c3 SHA1 f8b2e0a12c4c3de44b2a7f26e6bafd443334b459 SHA256 330e193af0293e4442cafda33a50e762a4d443a523a2fb5a6cf587bc41806286
+MISC ChangeLog 80155 RMD160 2a6fac37f268e231b1e7011e7ee498127e72e33b SHA1 b935241e272269c8ad06e176cd6f496cefb00590 SHA256 6977d255a97636b45bc806c7d4d587cd88821073e9dddc3e41215a4a2d8a9ca0
 MISC metadata.xml 1097 RMD160 b1d9ba9ac1576e4e70d144b4db37c221ca6290dd SHA1 5f659a37f0021e82eb8fe9572d87d2af2ffe212c SHA256 fd96c4817ed5c032a35790835aa072abbee8188b443e43f591badb35f8b38147
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6uT7sACgkQdjK8w9WeBnCfjwD/Ru9MMPC1eVOZOWeR8Kn7oXUL
-C07BZ8KZvRGEPVDnE5oA/1WWBhC9AsIR7NJ4VlLIUljuJBxI0zRnlKLE2RcN1Vhb
-=aYdc
+iF4EAREIAAYFAk7DBNkACgkQdjK8w9WeBnC1YgEAuaygBjvTRaGJXaFhtAkZEL2u
+X4bDhpMErxJAthbXVLsA/A7S0Bb6/VWN4tHD0YTsMldR8KwMldcMKvTe2cdl6hBw
+=XViP
 -----END PGP SIGNATURE-----
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"
 }