diff options
| -rw-r--r-- | gnome-extra/evolution-exchange/ChangeLog | 10 | ||||
| -rw-r--r-- | gnome-extra/evolution-exchange/evolution-exchange-2.28.1.ebuild (renamed from gnome-extra/evolution-exchange/evolution-exchange-2.26.2.ebuild) | 23 | ||||
| -rw-r--r-- | gnome-extra/evolution-exchange/files/evolution-exchange-2.28.0-as-needed.patch | 27 |
3 files changed, 55 insertions, 5 deletions
diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog index 0744c9d1cc98..c22a74795f04 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.104 2009/10/27 10:37:32 volkmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.105 2009/10/29 23:19:25 eva Exp $ + +*evolution-exchange-2.28.1 (29 Oct 2009) + + 29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> + -evolution-exchange-2.26.2.ebuild, + +files/evolution-exchange-2.28.0-as-needed.patch, + +evolution-exchange-2.28.1.ebuild: + New version for GNOME 2.28. Clean up old revision. 27 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> evolution-exchange-2.26.2.ebuild: diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.26.2.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.28.1.ebuild index cafdd5c85640..fd4a81d1264e 100644 --- a/gnome-extra/evolution-exchange/evolution-exchange-2.26.2.ebuild +++ b/gnome-extra/evolution-exchange/evolution-exchange-2.28.1.ebuild @@ -1,10 +1,10 @@ # 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.7 2009/10/27 10:37:32 volkmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.28.1.ebuild,v 1.1 2009/10/29 23:19:25 eva Exp $ 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" @@ -15,7 +15,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="debug doc static" RDEPEND=" - >=mail-client/evolution-2.26.0 + >=mail-client/evolution-2.28.0 + >=gnome-extra/evolution-data-server-2.28.0[ldap,kerberos] >=dev-libs/glib-2.16.0 >=x11-libs/gtk+-2.10 >=gnome-base/gconf-2.0 @@ -24,12 +25,12 @@ RDEPEND=" >=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 + dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 )" DOCS="AUTHORS ChangeLog NEWS README" @@ -41,3 +42,17 @@ pkg_setup() { $(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/files/evolution-exchange-2.28.0-as-needed.patch b/gnome-extra/evolution-exchange/files/evolution-exchange-2.28.0-as-needed.patch new file mode 100644 index 000000000000..4527580157bf --- /dev/null +++ b/gnome-extra/evolution-exchange/files/evolution-exchange-2.28.0-as-needed.patch @@ -0,0 +1,27 @@ +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 + |