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, 36 insertions, 22 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 4a1714ab1474..e4bdd71142db 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.317 2011/11/15 08:54:46 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.318 2011/11/16 00:32:42 tetromino Exp $
+
+*evolution-data-server-3.2.2 (16 Nov 2011)
+
+  16 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-data-server-2.32.2.ebuild, evolution-data-server-2.32.2-r1.ebuild,
+  evolution-data-server-2.32.3-r1.ebuild, -evolution-data-server-3.0.3.ebuild,
+  +evolution-data-server-3.2.2.ebuild:
+  Bump to 3.2.2 with assorted bugfixes. Drop old.
+  Also, QA: eautoreconf should be before gnome2_src_prepare.
 
   15 Nov 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   evolution-data-server-3.2.1.ebuild:
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild
index 34353011889a..e5cf618ab332 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-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/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild,v 1.7 2011/10/05 17:47:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild,v 1.8 2011/11/16 00:32:42 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -67,8 +67,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Adjust to gentoo's /etc/service
 	epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
 
@@ -96,6 +94,7 @@ src_prepare() {
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+	gnome2_src_prepare
 }
 
 src_install() {
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild
index d56c53b7b494..b5448eaf7b70 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.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/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild,v 1.7 2011/03/22 19:22:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild,v 1.8 2011/11/16 00:32:42 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -63,8 +63,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Adjust to gentoo's /etc/service
 	epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
 
@@ -89,6 +87,7 @@ src_prepare() {
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+	gnome2_src_prepare
 }
 
 src_install() {
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild
index e8bac3a7d99b..03d59069574c 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-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/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild,v 1.6 2011/10/30 16:18:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild,v 1.7 2011/11/16 00:32:42 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -69,8 +69,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Adjust to gentoo's /etc/service
 	epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
 
@@ -99,6 +97,7 @@ src_prepare() {
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+	gnome2_src_prepare
 }
 
 src_install() {
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.0.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild
index db418d9fa327..3cc708da9e0f 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.0.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.0.3.ebuild,v 1.2 2011/09/02 08:21:52 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild,v 1.1 2011/11/16 00:32:42 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit db-use eutils flag-o-matic gnome2 versionator virtualx
+inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
 
 DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="http://www.gnome.org/projects/evolution/"
 
 LICENSE="LGPL-2 BSD DB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +introspection ipv6 ldap kerberos ssl +weather"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl vala +weather"
 
 # GNOME3: How do we slot libedataserverui-3.0.so?
 # Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	>=x11-libs/gtk+-3.0:3
 	>=gnome-base/gconf-2
 	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.7.0
+	>=dev-libs/libgdata-0.9.1
 	>=gnome-base/gnome-keyring-2.20.1
 	>=dev-libs/libical-0.43
 	>=net-libs/libsoup-2.31.2:2.4
@@ -30,6 +30,9 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	>=sys-libs/db-4
 	sys-libs/zlib
 	virtual/libiconv
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.1.1
+		>=net-libs/liboauth-0.9.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-2 )
@@ -47,36 +50,41 @@ DEPEND="${RDEPEND}
 	>=gnome-base/gnome-common-2
 	>=dev-util/gtk-doc-am-1.9
 	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
 # eautoreconf needs:
 #	>=gnome-base/gnome-common-2
 #	>=dev-util/gtk-doc-am-1.9
 
+REQUIRED_USE="vala? ( introspection )"
+
 # FIXME
-RESTRIC="test"
+RESTRICT="test"
 
 pkg_setup() {
 	DOCS="ChangeLog MAINTAINERS NEWS TODO"
 	# Uh, what to do about dbus-call-timeout ?
 	G2CONF="${G2CONF}
+		VALAC=$(type -P valac-0.14)
+		VAPIGEN=$(type -P vapigen-0.14)
+		$(use_enable gnome-online-accounts goa)
+		$(use_enable introspection)
 		$(use_enable ipv6)
-		$(use_with kerberos krb5 /usr)
+		$(use_with kerberos krb5 ${EPREFIX}/usr)
 		$(use_with ldap openldap)
 		$(use_enable ssl ssl)
 		$(use_enable ssl smime)
+		$(use_enable vala vala-bindings)
 		$(use_enable weather)
 		--enable-calendar
 		--enable-nntp
 		--enable-largefile
-		--with-libdb=/usr"
+		--with-libdb=${EPREFIX}/usr"
 }
 
 src_prepare() {
 	gnome2_src_prepare
 
-	# Adjust to gentoo's /etc/service
-	epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
-
 	# GNOME bug 611353 (skips failing test atm)
 	# XXX: uncomment when there's a proper fix
 	#epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"