[gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     ea51285cfdd7d6c5cd55b098e178d30c0d484c71
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  9 12:22:19 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Feb  9 17:06:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ea51285c

mail-client/evolution: 2.91.6 -> 2.91.6.1

* Build fix, that we had already patched in

---
 ...ion-2.91.6.ebuild => evolution-2.91.6.1.ebuild} |    7 +----
 mail-client/evolution/evolution-9999.ebuild        |    2 +-
 .../files/evolution-2.91.6-fix-build-failure.patch |   21 --------------------
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/mail-client/evolution/evolution-2.91.6.ebuild b/mail-client/evolution/evolution-2.91.6.1.ebuild
similarity index 96%
rename from mail-client/evolution/evolution-2.91.6.ebuild
rename to mail-client/evolution/evolution-2.91.6.1.ebuild
index 2524dda..caf648f 100644
--- a/mail-client/evolution/evolution-2.91.6.ebuild
+++ b/mail-client/evolution/evolution-2.91.6.1.ebuild
@@ -34,13 +34,13 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 # pst is not mature enough and changes API/ABI frequently
 RDEPEND=">=dev-libs/glib-2.26.0:2
 	>=x11-libs/cairo-1.9.15
-	>=x11-libs/gtk+-2.99.2:3
+	>=x11-libs/gtk+-2.99.3:3
 	>=dev-libs/libunique-2.91.4:3
 	>=gnome-base/gnome-desktop-2.91.3:3
 	>=dev-libs/libgweather-2.90.0:3
 	media-libs/libcanberra[gtk3]
 	>=x11-libs/libnotify-0.7
-	>=gnome-extra/evolution-data-server-${PV}[weather]
+	>=gnome-extra/evolution-data-server-${MY_MAJORV}[weather]
 	>=gnome-extra/gtkhtml-3.31.3:4.0
 	>=gnome-base/gconf-2
 	dev-libs/atk
@@ -140,9 +140,6 @@ src_prepare() {
 	# Fix invalid use of la file in contact-editor, upstream bug #635002
 	epatch "${FILESDIR}/${PN}-2.32.0-wrong-lafile-usage.patch"
 
-	# Fix capplet build failure, from upstream, won't need next release
-	epatch "${FILESDIR}/${PN}-2.91.6-fix-build-failure.patch"
-
 	# Use NSS/NSPR only if 'ssl' is enabled.
 	if use ssl ; then
 		sed -e 's|mozilla-nss|nss|' \

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 266e282..d07a487 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -34,7 +34,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 # pst is not mature enough and changes API/ABI frequently
 RDEPEND=">=dev-libs/glib-2.26.0:2
 	>=x11-libs/cairo-1.9.15
-	>=x11-libs/gtk+-2.99.2:3
+	>=x11-libs/gtk+-2.99.3:3
 	>=dev-libs/libunique-2.91.4:3
 	>=gnome-base/gnome-desktop-2.91.3:3
 	>=dev-libs/libgweather-2.90.0:3

diff --git a/mail-client/evolution/files/evolution-2.91.6-fix-build-failure.patch b/mail-client/evolution/files/evolution-2.91.6-fix-build-failure.patch
deleted file mode 100644
index a227c17..0000000
--- a/mail-client/evolution/files/evolution-2.91.6-fix-build-failure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From bd7a0270f0f315197c20bb54397f0ae2bac0715d Mon Sep 17 00:00:00 2001
-From: Vibha Yadav <yvibha@novell.com>
-Date: Mon, 31 Jan 2011 12:58:50 +0000
-Subject: Bug 641003 - Build failure in mail-capplet
-
----
-diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
-index 7a9a4fa..c14af1b 100644
---- a/capplet/settings/mail-capplet-shell.c
-+++ b/capplet/settings/mail-capplet-shell.c
-@@ -26,6 +26,8 @@
- #ifdef HAVE_CONFIG_H
- #  include <config.h>
- #endif
-+
-+#include <gtk/gtkx.h>
- #include <glib/gi18n.h>
- #include <glib/gstdio.h>
- #include <gconf/gconf-client.h>
---
-cgit v0.8.3.1