New version for GNOME 2.26. Bug fixes and improvements. Clean up old revisions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 55 insertions, 59 deletions

diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog
index aeb92dee9c3d..04af7969dca6 100644
--- a/gnome-extra/evolution-exchange/ChangeLog
+++ b/gnome-extra/evolution-exchange/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/evolution-exchange
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.92 2009/05/20 05:14:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.93 2009/05/23 22:48:09 eva Exp $
+
+*evolution-exchange-2.26.2 (23 May 2009)
+
+  23 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -evolution-exchange-2.22.3-r2.ebuild, evolution-exchange-2.24.4.ebuild,
+  +evolution-exchange-2.26.2.ebuild:
+  New version for GNOME 2.26. Bug fixes and improvements. Clean up old
+  revisions.
 
   20 May 2009; Jeroen Roovers <jer@gentoo.org>
   evolution-exchange-2.24.5.ebuild:
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.22.3-r2.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.22.3-r2.ebuild
deleted file mode 100644
index ec60d4ba850a..000000000000
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.22.3-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.22.3-r2.ebuild,v 1.5 2009/02/06 03:09:01 jer Exp $
-EAPI="1"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
-HOMEPAGE="http://www.novell.com/products/desktop/features/evolution.html"
-LICENSE="GPL-2"
-
-SLOT="2.0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="debug doc static"
-
-RDEPEND="
-	>=mail-client/evolution-2.22.0
-	>=dev-libs/glib-2.15.3
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gconf-2.0
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libgnomeui-2.0
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	>=gnome-extra/evolution-data-server-2.22.3
-	>=net-nds/openldap-2.1.30-r2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.5
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_with debug e2k-debug)"
-
-	if ! built_with_use gnome-extra/evolution-data-server ldap || ! built_with_use gnome-extra/evolution-data-server kerberos; then
-		eerror "Please re-emerge gnome-extra/evolution-data-server with"
-		eerror "the use flags ldap and kerberos."
-		die
-	fi
-
-	G2CONF="${G2CONF} $(use_with static static-ldap) --with-openldap"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix addressbook crash, bug #233263
-	epatch "${FILESDIR}/${P}-addressbook-crash.patch"
-
-	# Fix exchange contacts tracking, upstream bug #546934
-	epatch "${FILESDIR}/${P}-exchange-contact.patch"
-}
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.24.4.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.24.4.ebuild
index 2ce2073f32fa..48113f428f07 100644
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.24.4.ebuild
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.24.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.24.4.ebuild,v 1.6 2009/05/10 15:14:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.24.4.ebuild,v 1.7 2009/05/23 22:48:09 eva Exp $
 
 EAPI="1"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.novell.com/products/desktop/features/evolution.html"
 LICENSE="GPL-2"
 
 SLOT="2.0"
-KEYWORDS="amd64 hppa ppc sparc x86"
+KEYWORDS="sparc"
 IUSE="debug doc static"
 
 RDEPEND="
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.26.2.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.26.2.ebuild
new file mode 100644
index 000000000000..d8b9d6150416
--- /dev/null
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.26.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.26.2.ebuild,v 1.1 2009/05/23 22:48:09 eva Exp $
+
+EAPI="2"
+
+inherit eutils gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
+HOMEPAGE="http://www.novell.com/products/desktop/features/evolution.html"
+LICENSE="GPL-2"
+
+SLOT="2.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc static"
+
+RDEPEND="
+	>=mail-client/evolution-2.26.0
+	>=dev-libs/glib-2.16.0
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/gconf-2.0
+	>=gnome-base/libbonobo-2.20.3
+	>=gnome-base/libglade-2.0
+	>=gnome-base/libgnomeui-2.0
+	dev-libs/libxml2
+	net-libs/libsoup:2.4
+	>=gnome-extra/evolution-data-server-2.26.0[ldap,kerberos]
+	>=net-nds/openldap-2.1.30-r2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-openldap
+		--disable-static
+		$(use_with debug e2k-debug)
+		$(use_with static static-ldap)"
+}
+