Version bump. Bug fixes. Clean up old revisions.

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

3 files changed, 34 insertions, 24 deletions

diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog
index 79f1211c0cc4..e5b2b20bc45a 100644
--- a/gnome-extra/evolution-exchange/ChangeLog
+++ b/gnome-extra/evolution-exchange/ChangeLog
@@ -1,6 +1,13 @@
 # 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.108 2009/12/03 17:19:58 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.109 2010/01/11 21:49:00 eva Exp $
+
+*evolution-exchange-2.28.2 (11 Jan 2010)
+
+  11 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -evolution-exchange-2.24.4.ebuild, evolution-exchange-2.24.5.ebuild,
+  +evolution-exchange-2.28.2.ebuild:
+  Version bump. Bug fixes. Clean up old revisions.
 
   03 Dec 2009; Brent Baude <ranger@gentoo.org>
   evolution-exchange-2.26.3.ebuild:
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.24.5.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.24.5.ebuild
index f4b0918cabcc..e8078e5dc695 100644
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.24.5.ebuild
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.24.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.24.5.ebuild,v 1.5 2009/05/31 21:59:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.24.5.ebuild,v 1.6 2010/01/11 21:49:00 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 ~ppc64 ~sparc x86"
+KEYWORDS="hppa"
 IUSE="debug doc static"
 
 RDEPEND="
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.24.4.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.28.2.ebuild
index 48113f428f07..1cfd3c26e871 100644
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.24.4.ebuild
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.28.2.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.24.4.ebuild,v 1.7 2009/05/23 22:48:09 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.28.2.ebuild,v 1.1 2010/01/11 21:49:00 eva Exp $
 
-EAPI="1"
+EAPI="2"
 
-inherit eutils gnome2
+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="sparc"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug doc static"
 
 RDEPEND="
-	>=mail-client/evolution-2.24.3
+	>=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
@@ -24,32 +25,34 @@ RDEPEND="
 	>=gnome-base/libgnomeui-2.0
 	dev-libs/libxml2
 	net-libs/libsoup:2.4
-	>=gnome-extra/evolution-data-server-2.24.3
 	>=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} $(use_with debug e2k-debug)"
+	G2CONF="${G2CONF}
+		--with-openldap
+		--disable-static
+		$(use_with debug e2k-debug)
+		$(use_with static static-ldap)"
+}
 
-	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
+src_prepare() {
+	gnome2_src_prepare
 
-	G2CONF="${G2CONF} $(use_with static static-ldap) --with-openldap"
-}
+	# Fix build with --as-needed, upstream bug #597489
+	epatch "${FILESDIR}/${PN}-2.28.0-as-needed.patch"
 
-src_unpack() {
-	gnome2_src_unpack
+	# FIXME: Fix compilation flags crazyness
+	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
+		-i configure.ac configure || die "sed 1 failed"
 
-	# intltoolize because e-e won't install locales otherwise
-	# thanks to recent intltool, no need to eautoreconf/eautomake
 	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
 }