Apply a patch to set version properly and, then, allow us to use a more future proof e-d-s patch for mail-client/mail-notification

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 43 insertions, 3 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 9bf821204cd6..e7b0c7c56bd2 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.257 2010/03/08 23:12:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.258 2010/04/29 20:54:02 pacho Exp $
+
+*evolution-data-server-2.28.3.1-r1 (29 Apr 2010)
+
+  29 Apr 2010; Pacho Ramos <pacho@gentoo.org>
+  -evolution-data-server-2.28.3.1.ebuild,
+  +evolution-data-server-2.28.3.1-r1.ebuild,
+  +files/evolution-data-server-2.28.3.1-version-number.patch:
+  Revision bump to apply a patch for setting version properly as talked with
+  Matthew Barnes (read the patch for more information). Thanks a lot to him
+  for his help.
 
 *evolution-data-server-2.28.3.1 (08 Mar 2010)
 
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.28.3.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.28.3.1-r1.ebuild
index 3f6babecbab7..5f0685c128c7 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.28.3.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.28.3.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.28.3.1.ebuild,v 1.1 2010/03/08 23:12:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.28.3.1-r1.ebuild,v 1.1 2010/04/29 20:54:02 pacho Exp $
 
 EAPI="2"
 
-inherit db-use eutils flag-o-matic gnome2 versionator
+inherit autotools db-use eutils flag-o-matic gnome2 versionator
 
 DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="http://www.gnome.org/projects/evolution/"
@@ -66,6 +66,9 @@ src_prepare() {
 	# Rewind in camel-disco-diary to fix a crash
 	epatch "${FILESDIR}/${PN}-1.8.0-camel-rewind.patch"
 
+	# Append .1 to version properly as talked with upstream
+	epatch "${FILESDIR}/${P}-version-number.patch"
+
 	if use doc; then
 		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
 			-i gtk-doc.make || die "sed 1 failed"
@@ -95,6 +98,8 @@ src_prepare() {
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
 		|| die "intltool rules fix failed"
+
+	eautoconf
 }
 
 src_install() {
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.3.1-version-number.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.3.1-version-number.patch
new file mode 100644
index 000000000000..b207dd3192b5
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.3.1-version-number.patch
@@ -0,0 +1,25 @@
+# As talked with Matthew Barnes (from upstream) this way to set version causes 
+# problems as results in a "3.1" slipping into the EDS_CHECK_VERSION preprocessor 
+# macro, and preprocessor macros don't like floating point numbers, causing problems
+# like mail-notification e-d-s patch not working when building against this e-d-s version.
+# This patch appends .1 to the version number properly.
+--- configure.ac~	2010-03-02 07:29:38.000000000 +0100
++++ configure.ac	2010-04-29 22:13:24.000000000 +0200
+@@ -1,7 +1,7 @@
+ dnl Evolution-Data-Server version
+ m4_define([eds_major_version], [2])
+ m4_define([eds_minor_version], [28])
+-m4_define([eds_micro_version], [3.1])
++m4_define([eds_micro_version], [3])
+ 
+ m4_define([eds_version],
+ 	[eds_major_version.eds_minor_version.eds_micro_version])
+@@ -19,7 +19,7 @@
+ 
+ dnl Autoconf / Automake Initialization
+ AC_PREREQ(2.58)
+-AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
++AC_INIT([evolution-data-server],[eds_version].1,[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
+ AM_INIT_AUTOMAKE([gnu 1.9])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(README)