Apply a patch to set version properly and, then, allow us to use a more future proof...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 9bf821204cd6bf400f18ce851ef59b5d784c8042..e7b0c7c56bd221b3debe37d723932a66f02d314d 100644 (file)
--- 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/Manifest b/gnome-extra/evolution-data-server/Manifest
index 3ac24bbba980e599c3e4d275b11644c49b669d35..64477f1a70a4d6d9e65ca4c59eec6d791110aba6 100644 (file)
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -8,18 +8,19 @@ AUX evolution-data-server-2.25.5-as-needed.patch 3489 RMD160 3594d79fe2fb53fdb0a
 AUX evolution-data-server-2.25.90-no-libdb.patch 355 RMD160 fcf879d6b7997f5731812bb76d05a05a777fbc56 SHA1 6ad4bff173c83c96573cf78ecd8131b2c08b76b0 SHA256 3b66f8d59c58bb2f3b5e8025892b9fabf6841cefe105e97e1070dda2d82d2088
 AUX evolution-data-server-2.26.3-camel-vee-folder.patch 1072 RMD160 5ea77f129629744e8b147cf707b6dee16b21d7dc SHA1 f8a3383c841edb5f345dced8a99fc38c9d6d28e9 SHA256 4bd7b35d7ba55e5a452aeeef1d96e2372d6312f533489259f7b777b0a6963ff4
 AUX evolution-data-server-2.28.0-gentoo_etc_services.patch 1294 RMD160 058a86636b5b544c312f086f31902b38001484f1 SHA1 2e7fb34243ed00efdcec2fda3fc109856ca451ff SHA256 14a3954871868cbae15891cfcb87135fd82077628f7ad49290fb955aeb4f192a
+AUX evolution-data-server-2.28.3.1-version-number.patch 1192 RMD160 17c142918982cb8272d8f36e794dd170cb212626 SHA1 45da8bdca73cd1805d74119fe26427a780f89033 SHA256 b5c5476a2b37eb6871d1c786bacde8212fd0aebf4e23ec56587b6b92de1bba32
 DIST evolution-data-server-2.26.3.tar.bz2 7167764 RMD160 83f68a464a0cfb50511f33e662d8a24ede42b9e6 SHA1 a9406b748d5a002df9570d17c91066575f2ba408 SHA256 ed2698d64dc663900b50f7a461d79c25e310462b7d41b1073257cbf950e75071
 DIST evolution-data-server-2.28.2.tar.bz2 22319961 RMD160 5041260ffa3430104c812ec5495bf6cba40c347f SHA1 dd2f35ed6765651c9daf0e709e0e9d65604d1eed SHA256 12e3ba23e4021a70be9cb6d418d1966883ee940bfa1a298294b036bde90faf2c
 DIST evolution-data-server-2.28.3.1.tar.bz2 14461320 RMD160 11f5c0311de98e590bba73a9a46d33c4d42d8538 SHA1 64dec0b300f3ba15da3969eb8e84b0e81b2842de SHA256 3f0457b755873533773f8f1c17cef8f6a25b77b7baf0e98100389e1210970d17
 EBUILD evolution-data-server-2.26.3.ebuild 3528 RMD160 6cf1472c699e9c60bc4a4d2266946c5b487fdfd1 SHA1 48e90958f963d2fdfcecb71af026b7cd613831ea SHA256 08725da4208365da62c149a1ccf1ca62660d68f92556e63a899c110bffa0f6e9
 EBUILD evolution-data-server-2.28.2.ebuild 3299 RMD160 e0231e682e4d2b664e0ad51ccfc7d61ac7d6a42e SHA1 daf8280801cf1a105b79bb116ea6440c7822a489 SHA256 37e4ccb8bbf1d2658dbc246d5c761221fa83d04b43f6dbc4c17a4149bdc0cb05
-EBUILD evolution-data-server-2.28.3.1.ebuild 3301 RMD160 b9ad810d5113a1a015515ab6c68ada9249e4289e SHA1 3d8bfd57dab8f36f62777bec877673b5896491b3 SHA256 9ee3283ca2b3d816063be4e31783d8690d8c7ae410153c10f7800629866c7e66
-MISC ChangeLog 49314 RMD160 4b0211a3e0b03c886f3ae5222466122ec9e29b42 SHA1 1991af18662f08bd19f3cd9f50d8a6b7fd60a0dd SHA256 71f4a89ab67ec706d25607ad0b7b3455eefcd4f7f7de901511043a3a12400d31
+EBUILD evolution-data-server-2.28.3.1-r1.ebuild 3434 RMD160 ef8722ba3e5b5d3375e6e47697a22218ff48a009 SHA1 14bb2d5cf2f3065d7b96fddd17534adb9ae71b55 SHA256 26e8f31a018fcf40baa87e558a7ec366f4bd5107f5928768da418999014835b7
+MISC ChangeLog 49731 RMD160 c0275ecfc172e889e504cbb5e5a77881a151fb7e SHA1 a50c4833ddce3118637edb4c87c2da9de56c14b9 SHA256 3ba087d82573c374c642842fc519c08748e4fa303130722370df5e986a62177f
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuVhFAACgkQ1fmVwcYIWAb8DQCghP3eYY/GcVZlPytwpHlbpGIl
-a/AAnjXdjXYR1v2yMnQMfAgBD8gKo06V
-=KlSi
+iEYEARECAAYFAkvZ8fAACgkQCaWpQKGI+9SULQCcD+FEyaMCpZ4rhAGkAUwL0kSw
+Ig8AniL2fwBjmm6uoxRETRh3lyYnjvsZ
+=GsAN
 -----END PGP SIGNATURE-----

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
similarity index 92%
rename from gnome-extra/evolution-data-server/evolution-data-server-2.28.3.1.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-2.28.3.1-r1.ebuild
index 3f6babecbab7474fd59f1cc3577d7e6e24e42d3f..5f0685c128c7dafdb1626c3991a2408144f21784 100644 (file)
--- 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 (file)
index 0000000..b207dd3
--- /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)