Version bump, remove old.

(Portage version: 2.1.9.50/cvs/Linux x86_64)

2 files changed, 22 insertions, 19 deletions

diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog
index 7aa3cbaa50dd..c119c78e06da 100644
--- a/gnome-extra/evolution-exchange/ChangeLog
+++ b/gnome-extra/evolution-exchange/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/evolution-exchange
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.136 2011/03/23 08:01:35 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.137 2011/06/19 21:38:54 pacho Exp $
+
+*evolution-exchange-2.32.3 (19 Jun 2011)
+
+  19 Jun 2011; Pacho Ramos <pacho@gentoo.org>
+  -evolution-exchange-2.30.3.ebuild, +evolution-exchange-2.32.3.ebuild:
+  Version bump, remove old.
 
   23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   -evolution-exchange-2.30.2.ebuild, evolution-exchange-2.30.3.ebuild,
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.30.3.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild
index 43cd003be6a1..6a36f233be80 100644
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.30.3.ebuild
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2011 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.30.3.ebuild,v 1.2 2011/03/23 08:01:35 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild,v 1.1 2011/06/19 21:38:54 pacho Exp $
 
-EAPI="2"
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2
 
 DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
-HOMEPAGE="http://www.novell.com/products/desktop/features/evolution.html"
+HOMEPAGE="http://projects.gnome.org/evolution/"
 LICENSE="GPL-2"
 
 SLOT="2.0"
@@ -15,11 +18,11 @@ 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:2
-	>=x11-libs/gtk+-2.10:2
-	>=gnome-base/gconf-2.0:2
+	>=mail-client/evolution-2.32.2:2.0
+	>=gnome-extra/evolution-data-server-2.32.2[ldap,kerberos]
+	>=dev-libs/glib-2.16:2
+	>=x11-libs/gtk+-2.20:2
+	>=gnome-base/gconf-2:2
 	dev-libs/libxml2:2
 	net-libs/libsoup:2.4
 	>=net-nds/openldap-2.1.30-r2
@@ -28,30 +31,24 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
-	>=dev-util/gtk-doc-am-1.9
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 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/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
+	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
 		-i configure.ac configure || die "sed 1 failed"
-
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-		|| die "sed 2 failed"
-
-	sed 's:-DG.*DISABLE_SINGLE_INCLUDES::g' -i configure.ac configure \
-		|| die "sed 3 failed"
 }