Version bump for Gnome 2.32. Make weather component optional, bug #289796. Clean up old revisions.

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

14 files changed, 253 insertions, 391 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 3a803dea3373..b35404f3764f 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.277 2010/10/17 15:22:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.278 2010/11/14 22:39:04 eva Exp $
+
+*evolution-data-server-2.32.0 (14 Nov 2010)
+
+  14 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/evolution-data-server-1.2.0-gentoo_etc_services.patch,
+  -files/evolution-data-server-2.25.5-as-needed.patch,
+  -files/evolution-data-server-2.25.90-no-libdb.patch,
+  -evolution-data-server-2.26.3.ebuild,
+  -files/evolution-data-server-2.26.3-camel-vee-folder.patch,
+  -evolution-data-server-2.28.3.1-r1.ebuild,
+  -files/evolution-data-server-2.28.3.1-version-number.patch,
+  evolution-data-server-2.30.3.ebuild,
+  +files/evolution-data-server-2.31-camel-rewind.patch,
+  +files/evolution-data-server-2.31-gentoo_etc_services.patch,
+  +evolution-data-server-2.32.0.ebuild,
+  +files/evolution-data-server-2.32.0-libtool-fix.patch, metadata.xml:
+  Version bump for Gnome 2.32. Make weather component optional, bug #289796.
+  Clean up old revisions.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org>
   evolution-data-server-2.30.2.ebuild:
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.26.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.26.3.ebuild
deleted file mode 100644
index e3f76bafbf3d..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.26.3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2010 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.26.3.ebuild,v 1.14 2010/08/05 16:56:20 ssuominen Exp $
-
-EAPI="2"
-
-inherit db-use eutils flag-o-matic gnome2 autotools versionator
-
-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"
-IUSE="doc ipv6 kerberos gnome-keyring ldap ssl"
-
-RDEPEND=">=dev-libs/glib-2.16.1
-	>=x11-libs/gtk+-2.14
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=dev-libs/libxml2-2
-	>=net-libs/libsoup-2.4
-	>=dev-libs/libgweather-2.25.4
-	>=dev-libs/libical-0.43
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
-	>=dev-db/sqlite-3.5
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	>=gnome-base/libgnomeui-2
-	sys-libs/zlib
-	=sys-libs/db-4*
-	ldap? ( >=net-nds/openldap-2.0 )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(use_enable ipv6)
-		$(use_enable gnome-keyring)
-		--with-weather
-		--with-libdb=/usr/$(get_libdir)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Adjust to gentoo's /etc/service
-	epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch
-
-	# Fix broken libdb build
-	epatch "${FILESDIR}"/${PN}-2.25.90-no-libdb.patch
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
-
-	# Fix building evo-exchange with --as-needed, upstream bug #342830
-	# and configure failing to detect kerberos5-libs with as-needed
-	epatch "${FILESDIR}"/${PN}-2.25.5-as-needed.patch
-
-	# Fix hang while updating search folders, bug #277864, upstream bug #583507
-	epatch "${FILESDIR}/${PN}-2.26.3-camel-vee-folder.patch"
-
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
-	# gtk-doc-am and gnome-common needed for this
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" "${S}"/configure || die "sed failed"
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-		--without-nss-libs --without-nss-includes"
-	fi
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use ldap; then
-		MY_MAJORV=$(get_version_component_range 1-2)
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema || die "doins failed"
-		dosym "${D}"/usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use ldap; then
-		elog ""
-		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.28.3.1-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.28.3.1-r1.ebuild
deleted file mode 100644
index c8ca5a2e6ef5..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.28.3.1-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2010 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.28.3.1-r1.ebuild,v 1.7 2010/08/18 22:09:59 maekke Exp $
-
-EAPI="2"
-
-inherit autotools db-use eutils flag-o-matic gnome2 versionator
-
-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 ipv6 kerberos gnome-keyring ldap ssl"
-
-RDEPEND=">=dev-libs/glib-2.16.1
-	>=x11-libs/gtk+-2.14
-	>=gnome-base/orbit-2.9.8
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=dev-libs/libxml2-2
-	>=net-libs/libsoup-2.4
-	>=dev-libs/libgweather-2.25.4
-	>=dev-libs/libical-0.43
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
-	>=dev-db/sqlite-3.5
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
-	sys-libs/zlib
-	=sys-libs/db-4*
-	ldap? ( >=net-nds/openldap-2.0 )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-2
-	>=dev-util/gtk-doc-am-1.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(use_enable ipv6)
-		$(use_enable gnome-keyring)
-		--with-weather
-		--with-libdb=/usr/$(get_libdir)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Adjust to gentoo's /etc/service
-	epatch "${FILESDIR}/${PN}-2.28.0-gentoo_etc_services.patch"
-
-	# Rewind in camel-disco-diary to fix a crash
-	epatch "${FILESDIR}/${PN}-1.8.0-camel-rewind.patch"
-
-	# Append .1 to version properly as talked with upstream
-	epatch "${FILESDIR}/${P}-version-number.patch"
-
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" "${S}"/configure || die "sed failed"
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-		--without-nss-libs --without-nss-includes"
-	fi
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	# FIXME: Fix compilation flags crazyness
-	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
-		-i configure.ac configure || die "sed 3 failed"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "intltool rules fix failed"
-
-	eautoconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use ldap; then
-		MY_MAJORV=$(get_version_component_range 1-2)
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema || die "doins failed"
-		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use ldap; then
-		elog ""
-		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.30.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.30.3.ebuild
index d8ce637b2004..568d1c00b911 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.30.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.30.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.30.3.ebuild,v 1.2 2010/09/26 17:48:57 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.30.3.ebuild,v 1.3 2010/11/14 22:39:04 eva Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ 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 ipv6 kerberos gnome-keyring ldap ssl"
+IUSE="doc ipv6 kerberos gnome-keyring ldap ssl weather"
 
 RDEPEND=">=dev-libs/glib-2.16.1
 	>=x11-libs/gtk+-2.18
@@ -21,7 +21,6 @@ RDEPEND=">=dev-libs/glib-2.16.1
 	>=dev-db/sqlite-3.5
 	>=dev-libs/libxml2-2
 	>=net-libs/libsoup-2.4:2.4
-	>=dev-libs/libgweather-2.25.4
 	>=dev-libs/libical-0.43
 	>=dev-libs/dbus-glib-0.6
 	>=sys-libs/db-4
@@ -32,7 +31,8 @@ RDEPEND=">=dev-libs/glib-2.16.1
 		>=dev-libs/nspr-4.4
 		>=dev-libs/nss-3.9 )
 	ldap? ( >=net-nds/openldap-2 )
-	kerberos? ( virtual/krb5 )"
+	kerberos? ( virtual/krb5 )
+	weather? ( >=dev-libs/libgweather-2.25.4 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
@@ -52,7 +52,7 @@ pkg_setup() {
 		$(use_enable ipv6)
 		$(use_enable ssl ssl)
 		$(use_enable ssl smime)
-		--with-weather
+		$(use_with weather)
 		--enable-largefile
 		--with-libdb=/usr/$(get_libdir)"
 }
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.0.ebuild
new file mode 100644
index 000000000000..eae697140531
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2010 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.0.ebuild,v 1.1 2010/11/14 22:39:04 eva Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+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 ipv6 kerberos gnome-keyring ldap ssl weather"
+
+RDEPEND=">=dev-libs/glib-2.25.12:2
+	>=x11-libs/gtk+-2.20:2
+	>=gnome-base/gconf-2
+	>=dev-db/sqlite-3.5
+	>=dev-libs/libgdata-0.6.3
+	>=dev-libs/libical-0.43
+	>=net-libs/libsoup-2.4:2.4
+	>=dev-libs/libxml2-2
+	>=sys-libs/db-4
+	sys-libs/zlib
+	virtual/libiconv
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2 )
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
+	weather? ( >=dev-libs/libgweather-2.25.4 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35.5
+	>=gnome-base/gnome-common-2
+	>=dev-util/gtk-doc-am-1.9
+	sys-devel/bison
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2
+#	>=dev-util/gtk-doc-am-1.9
+
+pkg_setup() {
+	DOCS="ChangeLog MAINTAINERS NEWS TODO"
+	G2CONF="${G2CONF}
+		$(use_enable gnome-keyring)
+		$(use_enable ipv6)
+		$(use_with kerberos krb5 /usr)
+		$(use_with ldap openldap)
+		$(use_enable ssl ssl)
+		$(use_enable ssl smime)
+		$(use_with weather)
+		--disable-gtk3
+		--enable-largefile
+		--with-libdb=/usr"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Adjust to gentoo's /etc/service
+	epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
+
+	# Rewind in camel-disco-diary to fix a crash
+	epatch "${FILESDIR}/${PN}-2.31-camel-rewind.patch"
+
+	# GNOME bug 611353 (skips failing test atm)
+	epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
+
+	# Fix libtool re-linking mess, bug #341493
+	epatch "${FILESDIR}/${PN}-2.32.0-libtool-fix.patch"
+
+	# GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
+	sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
+		-i addressbook/tests/Makefile.{am,in} \
+		|| die "failing test sed 1 failed"
+
+	# Failing calendar checks ?
+	sed -e 's/\(SUBDIRS =.*\)ecal/\1/' \
+		-i calendar/tests/Makefile.{am,in} \
+		|| die "failing test sed 2 failed"
+
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	# FIXME: Fix compilation flags crazyness
+	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure.ac configure || die "sed 3 failed"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	find "${ED}" -name "*.la" -delete || die "la files removal failed"
+
+	if use ldap; then
+		MY_MAJORV=$(get_version_component_range 1-2)
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema || die "doins failed"
+		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	Xemake check || die "Tests failed."
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
+		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
+		libedata-book-1.2.so.2 libebook-1.2.so.9 \
+		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
+	do
+		preserve_old_lib /usr/$(get_libdir)/$lib
+	done
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
+		libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
+		libedata-book-1.2.so.2 libebook-1.2.so.9 \
+		libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
+	do
+		preserve_old_lib_notify /usr/$(get_libdir)/$lib
+	done
+
+	if use ldap; then
+		elog ""
+		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
+	fi
+}
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.2.0-gentoo_etc_services.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.2.0-gentoo_etc_services.patch
deleted file mode 100644
index ad9044e9ff0c..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.2.0-gentoo_etc_services.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u camel.orig/providers/imap/camel-imap-store.c camel/providers/imap/camel-imap-store.c
---- camel.orig/providers/imap/camel-imap-store.c	2005-03-03 10:30:32.785549256 -0600
-+++ camel/providers/imap/camel-imap-store.c	2005-03-03 10:33:18.970285336 -0600
-@@ -924,7 +924,7 @@
- 		port = ssl_options[i].port;
- 	} else {
- 		mode = MODE_CLEAR;
--		serv = "imap";
-+		serv = "imap2";
- 		port = IMAP_PORT;
- 	}
- 	
-diff -u camel.orig/providers/pop3/camel-pop3-store.c camel/providers/pop3/camel-pop3-store.c
---- camel.orig/providers/pop3/camel-pop3-store.c	2005-03-03 10:30:32.779550168 -0600
-+++ camel/providers/pop3/camel-pop3-store.c	2005-03-03 10:34:40.812843376 -0600
-@@ -308,7 +308,7 @@
- 		port = ssl_options[i].port;
- 	} else {
- 		mode = MODE_CLEAR;
--		serv = "pop3";
-+		serv = "pop-3";
- 		port = POP3S_PORT;
- 	}
- 	
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.5-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.5-as-needed.patch
deleted file mode 100644
index c8c33b400ed6..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.5-as-needed.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/addressbook/backends/Makefile.am evolution-data-server-2.23.6/addressbook/backends/Makefile.am
---- evolution-data-server-2.23.6.orig/addressbook/backends/Makefile.am	2008-08-04 00:28:27.000000000 -0400
-+++ evolution-data-server-2.23.6/addressbook/backends/Makefile.am	2008-08-05 12:26:15.000000000 -0400
-@@ -4,4 +4,4 @@ else
- LDAP_SUBDIR =
- endif
- 
--SUBDIRS = file vcf $(LDAP_SUBDIR) google groupwise webdav
-+SUBDIRS = file vcf $(LDAP_SUBDIR)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/calendar/backends/Makefile.am evolution-data-server-2.23.6/calendar/backends/Makefile.am
---- evolution-data-server-2.23.6.orig/calendar/backends/Makefile.am	2008-04-11 07:10:31.000000000 -0400
-+++ evolution-data-server-2.23.6/calendar/backends/Makefile.am	2008-08-05 12:25:51.000000000 -0400
-@@ -7 +7 @@
--SUBDIRS = file groupwise http contacts $(WEATHER_SUBDIR) caldav google
-+SUBDIRS = file http contacts $(WEATHER_SUBDIR) caldav
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/camel/providers/Makefile.am evolution-data-server-2.23.6/camel/providers/Makefile.am
---- evolution-data-server-2.23.6.orig/camel/providers/Makefile.am	2008-08-01 02:34:59.000000000 -0400
-+++ evolution-data-server-2.23.6/camel/providers/Makefile.am	2008-08-05 12:26:59.000000000 -0400
-@@ -21,6 +21,6 @@ else
- SENDMAIL_DIR=sendmail
- endif
- 
--SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise $(HULA_DIR)
-+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) $(HULA_DIR)
- 
- 
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/Makefile.am evolution-data-server-2.23.6/Makefile.am
---- evolution-data-server-2.23.6.orig/Makefile.am	2008-08-01 02:35:37.000000000 -0400
-+++ evolution-data-server-2.23.6/Makefile.am	2008-08-05 12:28:22.000000000 -0400
-@@ -7,9 +7,12 @@ endif
- 
- if ENABLE_CALENDAR
- CALENDAR_DIR = calendar
-+CALENDAR_LATER = calendar/backends/groupwise calendar/backends/google
- endif
- 
--SUBDIRS = $(LIBDB) win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
-+LATER = camel/providers/groupwise addressbook/backends/groupwise addressbook/backends/google addressbook/backends/webdav $(CALENDAR_LATER)
-+
-+SUBDIRS = $(LIBDB) win32 libedataserver libebackend camel addressbook $(CALENDAR_DIR) libedataserverui servers $(LATER) src docs art po
- DIST_SUBDIRS= win32 libedataserver libebackend servers camel addressbook calendar libedataserverui src docs art po	
- changelogs =			\
- 	ChangeLog
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/servers/exchange/storage/Makefile.am evolution-data-server-2.23.6/servers/exchange/storage/Makefile.am
---- evolution-data-server-2.23.6.orig/servers/exchange/storage/Makefile.am	2008-04-11 07:10:16.000000000 -0400
-+++ evolution-data-server-2.23.6/servers/exchange/storage/Makefile.am	2008-08-05 12:25:51.000000000 -0400
-@@ -64,6 +64,7 @@ libexchange_storage_1_2_la_LIBADD =				\
- 	$(top_builddir)/servers/exchange/lib/libexchange.la	\
- 	$(top_builddir)/servers/exchange/xntlm/libxntlm.la	\
- 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-+	$(top_builddir)/libedataserverui/libedataserverui-1.2.la	\
- 	$(E_DATA_SERVER_LIBS)					\
- 	$(E_DATA_SERVER_UI_LIBS)				\
- 	$(LDAP_LIBS)						\
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.90-no-libdb.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.90-no-libdb.patch
deleted file mode 100644
index d201a56ac9b7..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.90-no-libdb.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# We only support dynamic libdb
---- a/configure.in	2007-06-04 06:50:47.000000000 -0400
-+++ b/configure.in	2007-06-07 10:58:22.000000000 -0400
-@@ -1431,9 +1431,6 @@ export privdatadir
- export privincludedir
- export privdatadir
-
--if test $dynamic_libdb = no; then
--        AC_CONFIG_SUBDIRS(libdb/dist)
--fi
- AC_OUTPUT([
- Makefile
- evolution-data-server-zip
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.3-camel-vee-folder.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.3-camel-vee-folder.patch
deleted file mode 100644
index 18387571be58..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.3-camel-vee-folder.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix hand while updating search folders
-
-Gnome: http://bugzilla.gnome.org/show_bug.cgi?id=583507
-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=277864
-diff -up a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
---- a/camel/camel-vee-folder.c	2009-06-26 08:36:57.000000000 -0400
-+++ b/camel/camel-vee-folder.c	2009-07-14 14:10:51.000000000 -0400
-@@ -1533,12 +1533,14 @@ folder_changed_change(CamelSession *sess
- 	}
- 
- 	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);
--	if (matches_changed || matches_added || changes->uid_removed->len||present)
--		camel_db_begin_transaction (folder->parent_store->cdb_w, NULL);
- 
- 	if (folder_unmatched != NULL)
- 		CAMEL_VEE_FOLDER_LOCK(folder_unmatched, summary_lock);
- 
-+	if (matches_changed || matches_added || changes->uid_removed->len||present)
-+		camel_db_begin_transaction (folder->parent_store->cdb_w, NULL);
-+
-+
- 	dd(printf("Vfolder '%s' subfolder changed '%s'\n", folder->full_name, sub->full_name));
- 	dd(printf(" changed %u added %u removed %u\n", changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len));
- 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.3.1-version-number.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.3.1-version-number.patch
deleted file mode 100644
index b207dd3192b5..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.3.1-version-number.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# As talked with Matthew Barnes (from upstream) this way to set version causes 
-# problems as results in a "3.1" slipping into the EDS_CHECK_VERSION preprocessor 
-# macro, and preprocessor macros don't like floating point numbers, causing problems
-# like mail-notification e-d-s patch not working when building against this e-d-s version.
-# This patch appends .1 to the version number properly.
---- configure.ac~	2010-03-02 07:29:38.000000000 +0100
-+++ configure.ac	2010-04-29 22:13:24.000000000 +0200
-@@ -1,7 +1,7 @@
- dnl Evolution-Data-Server version
- m4_define([eds_major_version], [2])
- m4_define([eds_minor_version], [28])
--m4_define([eds_micro_version], [3.1])
-+m4_define([eds_micro_version], [3])
- 
- m4_define([eds_version],
- 	[eds_major_version.eds_minor_version.eds_micro_version])
-@@ -19,7 +19,7 @@
- 
- dnl Autoconf / Automake Initialization
- AC_PREREQ(2.58)
--AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
-+AC_INIT([evolution-data-server],[eds_version].1,[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
- AM_INIT_AUTOMAKE([gnu 1.9])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR(README)
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.31-camel-rewind.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.31-camel-rewind.patch
new file mode 100644
index 000000000000..36da52c30170
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.31-camel-rewind.patch
@@ -0,0 +1,11 @@
+--- camel/camel-disco-diary.c.orig
++++ camel/camel-disco-diary.c
+@@ -411,6 +411,7 @@ camel_disco_diary_replay (CamelDiscoDiary *diary,
+ 
+ 	/* Truncate the log */
+ 	ftruncate (fileno (diary->file), 0);
++	rewind (diary->file);
+ 
+ 	g_propagate_error (error, local_error);
+ }
+
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.31-gentoo_etc_services.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.31-gentoo_etc_services.patch
new file mode 100644
index 000000000000..b7c7dceebc98
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.31-gentoo_etc_services.patch
@@ -0,0 +1,40 @@
+From 02cc551defa9cb222216b4ae03a9e883a9abcb64 Mon Sep 17 00:00:00 2001
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Mon, 28 Sep 2009 21:34:36 +0200
+Subject: [PATCH] Adjust imap+pop3 stuffs to gentoo services
+
+---
+ camel/providers/imap/camel-imap-store.c |    2 +-
+ camel/providers/pop3/camel-pop3-store.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
+index a5eb640..1574e79 100644
+--- a/camel/providers/imap/camel-imap-store.c
++++ b/camel/providers/imap/camel-imap-store.c
+@@ -846,7 +846,7 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex)
+ 		fallback_port = ssl_options[i].fallback_port;
+ 	} else {
+ 		mode = MODE_CLEAR;
+-		serv = (gchar *) "imap";
++		serv = (gchar *) "imap2";
+ 		fallback_port = IMAP_PORT;
+ 	}
+ 
+diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
+index 89be794..a79c06b 100644
+--- a/camel/providers/pop3/camel-pop3-store.c
++++ b/camel/providers/pop3/camel-pop3-store.c
+@@ -268,7 +268,7 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex)
+ 		fallback_port = ssl_options[i].fallback_port;
+ 	} else {
+ 		mode = MODE_CLEAR;
+-		serv = (gchar *) "pop3";
++		serv = (gchar *) "pop-3";
+ 		fallback_port = POP3S_PORT;
+ 	}
+ 
+ 
+-- 
+1.6.5.rc1
+
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.0-libtool-fix.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.0-libtool-fix.patch
new file mode 100644
index 000000000000..902a40160cc0
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.0-libtool-fix.patch
@@ -0,0 +1,28 @@
+diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
+index 47831ba..e3320f9 100644
+--- a/calendar/libecal/Makefile.am
++++ b/calendar/libecal/Makefile.am
+@@ -31,8 +31,8 @@ libecal_1_2_la_SOURCES =			\
+ 	e-cal-view-private.h
+ 
+ libecal_1_2_la_LIBADD = 					\
+-	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la	\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la 	\
++	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la	\
+ 	$(LIBICAL_LIBS)						\
+ 	$(EVOLUTION_CALENDAR_LIBS)
+ 
+diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
+index 8b2f5f0..c9dc25b 100644
+--- a/calendar/libedata-cal/Makefile.am
++++ b/calendar/libedata-cal/Makefile.am
+@@ -36,8 +36,8 @@ libedata_cal_1_2_la_SOURCES =		\
+ 	e-data-cal-view.c
+ 
+ libedata_cal_1_2_la_LIBADD =					\
+-	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la	\
+ 	$(top_builddir)/calendar/libecal/libecal-1.2.la		\
++	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la	\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la 	\
+ 	$(top_builddir)/libebackend/libebackend-1.2.la 		\
+ 	$(LIBICAL_LIBS)						\
\ No newline at end of file
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
index da6fd63d0085..de1b8f9461ef 100644
--- a/gnome-extra/evolution-data-server/metadata.xml
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="weather">Enable optional weather calendar support.</flag>
+</use>
 </pkgmetadata>