Version bump for Gnome 2.32, remove old.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

5 files changed, 66 insertions, 129 deletions

diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog
index b6bdc8265772..08f80411cf69 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.127 2010/10/17 15:43:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.128 2010/11/15 10:03:32 pacho Exp $
+
+*evolution-exchange-2.32.0 (15 Nov 2010)
+
+  15 Nov 2010; Pacho Ramos <pacho@gentoo.org>
+  -evolution-exchange-2.26.3.ebuild,
+  -files/evolution-exchange-2.28.0-as-needed.patch,
+  -evolution-exchange-2.28.3.ebuild, +evolution-exchange-2.32.0.ebuild:
+  Version bump for Gnome 2.32, remove old.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org>
   evolution-exchange-2.30.2.ebuild:
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.26.3.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.26.3.ebuild
deleted file mode 100644
index 4920f37b16e5..000000000000
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.26.3.ebuild
+++ /dev/null
@@ -1,43 +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-exchange/evolution-exchange-2.26.3.ebuild,v 1.12 2010/07/19 15:50:50 jer 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="alpha amd64 ia64 ppc ppc64 sparc 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)"
-}
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.28.3.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.28.3.ebuild
deleted file mode 100644
index 58840b51f704..000000000000
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.28.3.ebuild
+++ /dev/null
@@ -1,58 +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-exchange/evolution-exchange-2.28.3.ebuild,v 1.5 2010/08/14 18:49:06 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools 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="alpha amd64 ia64 ~ppc ~ppc64 sparc x86"
-IUSE="debug doc static"
-
-RDEPEND="
-	>=mail-client/evolution-${PV}
-	>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos]
-	>=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
-	>=net-nds/openldap-2.1.30-r2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	dev-util/gtk-doc-am
-	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)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix build with --as-needed, upstream bug #597489
-	epatch "${FILESDIR}/${PN}-2.28.0-as-needed.patch"
-
-	# FIXME: Fix compilation flags crazyness
-	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.32.0.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.32.0.ebuild
new file mode 100644
index 000000000000..02cd15802175
--- /dev/null
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.32.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 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.32.0.ebuild,v 1.1 2010/11/15 10:03:32 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
+HOMEPAGE="http://projects.gnome.org/evolution/"
+LICENSE="GPL-2"
+
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc static"
+
+RDEPEND="
+	>=mail-client/evolution-${PV}:2.0
+	>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos]
+	>=dev-libs/glib-2.16:2
+	>=x11-libs/gtk+-2.20:2
+	>=gnome-base/gconf-2
+	dev-libs/libxml2
+	net-libs/libsoup:2.4
+	>=net-nds/openldap-2.1.30-r2
+	virtual/krb5"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-krb5=/usr
+		--with-openldap
+		--disable-static
+		--disable-maintainer-mode
+		--disable-gtk3
+		$(use_enable debug e2k-debug)
+		$(use_with static static-ldap)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: Fix compilation flags crazyness
+	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure.ac configure || die "sed 1 failed"
+}
+
+src_install() {
+	gnome2_src_install
+	find "${ED}" -name "*.la" -delete || die "la files removal failed"
+}
diff --git a/gnome-extra/evolution-exchange/files/evolution-exchange-2.28.0-as-needed.patch b/gnome-extra/evolution-exchange/files/evolution-exchange-2.28.0-as-needed.patch
deleted file mode 100644
index 4527580157bf..000000000000
--- a/gnome-extra/evolution-exchange/files/evolution-exchange-2.28.0-as-needed.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e15fec5e7eadbcd48883c47605cc14998368b4f0 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 7 Oct 2009 23:21:25 +0200
-Subject: [PATCH] Fixed weird missing symbols while building migr-test
-
-GNOME bug #597489
----
- storage/Makefile.am |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/storage/Makefile.am b/storage/Makefile.am
-index ff68314..45da125 100644
---- a/storage/Makefile.am
-+++ b/storage/Makefile.am
-@@ -78,7 +78,8 @@ migr_test_SOURCES = \
- 	exchange-config-listener.c \
- 	exchange-config-listener.h \
- 	exchange-migrate.c \
--	exchange-migrate.h
-+	exchange-migrate.h \
-+	exchange-autoconfig-wizard.c
- 
- migr_test_LDADD =  \
- 	$(top_builddir)/mail/libexchangemail.la  \
--- 
-1.6.5.rc1
-