From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PnGQU-0008U1-PL for garchives@archives.gentoo.org; Wed, 09 Feb 2011 20:14:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5122EE09D4; Wed, 9 Feb 2011 20:13:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 13C1CE0955 for ; Wed, 9 Feb 2011 20:13:24 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76C4B1B414A for ; Wed, 9 Feb 2011 20:13:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id ADABA80075 for ; Wed, 9 Feb 2011 20:13:22 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/ X-VCS-Repository: proj/gnome X-VCS-Files: mail-client/evolution/evolution-2.91.6.1.ebuild mail-client/evolution/evolution-2.91.6.ebuild mail-client/evolution/evolution-9999.ebuild mail-client/evolution/files/evolution-2.91.6-fix-build-failure.patch X-VCS-Directories: mail-client/evolution/ mail-client/evolution/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: ea51285cfdd7d6c5cd55b098e178d30c0d484c71 Date: Wed, 9 Feb 2011 20:13:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 0ec0454d6f5efac1012720c01ce3996b commit: ea51285cfdd7d6c5cd55b098e178d30c0d484c71 Author: Nirbheek Chauhan gentoo org> AuthorDate: Wed Feb 9 12:22:19 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Wed Feb 9 17:06:04 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dea51285c mail-client/evolution: 2.91.6 -> 2.91.6.1 * Build fix, that we had already patched in --- ...ion-2.91.6.ebuild =3D> 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=3D"|| ( app-crypt/pinentry[gtk] app-c= rypt/pinentry-qt app-crypt/pi # pst is not mature enough and changes API/ABI frequently RDEPEND=3D">=3Ddev-libs/glib-2.26.0:2 >=3Dx11-libs/cairo-1.9.15 - >=3Dx11-libs/gtk+-2.99.2:3 + >=3Dx11-libs/gtk+-2.99.3:3 >=3Ddev-libs/libunique-2.91.4:3 >=3Dgnome-base/gnome-desktop-2.91.3:3 >=3Ddev-libs/libgweather-2.90.0:3 media-libs/libcanberra[gtk3] >=3Dx11-libs/libnotify-0.7 - >=3Dgnome-extra/evolution-data-server-${PV}[weather] + >=3Dgnome-extra/evolution-data-server-${MY_MAJORV}[weather] >=3Dgnome-extra/gtkhtml-3.31.3:4.0 >=3Dgnome-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" =20 - # 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/ev= olution/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=3D"|| ( app-crypt/pinentry[gtk] app-cry= pt/pinentry-qt app-crypt/pi # pst is not mature enough and changes API/ABI frequently RDEPEND=3D">=3Ddev-libs/glib-2.26.0:2 >=3Dx11-libs/cairo-1.9.15 - >=3Dx11-libs/gtk+-2.99.2:3 + >=3Dx11-libs/gtk+-2.99.3:3 >=3Ddev-libs/libunique-2.91.4:3 >=3Dgnome-base/gnome-desktop-2.91.3:3 >=3Ddev-libs/libgweather-2.90.0:3 diff --git a/mail-client/evolution/files/evolution-2.91.6-fix-build-failu= re.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.patc= h +++ /dev/null @@ -1,21 +0,0 @@ -From bd7a0270f0f315197c20bb54397f0ae2bac0715d Mon Sep 17 00:00:00 2001 -From: Vibha Yadav -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/ma= il-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 - #endif -+ -+#include - #include - #include - #include --- -cgit v0.8.3.1