[gentoo-commits] gentoo-x86 commit in gnome-extra/evolution-data-server: ChangeLog evolution-data-server-3.2.3-r2.ebuild

[gentoo-commits] gentoo-x86 commit in gnome-extra/evolution-data-server: ChangeLog evolution-data-server-3.2.3-r2.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    12/06/20 06:51:30

  Modified:             ChangeLog evolution-data-server-3.2.3-r2.ebuild
  Log:
  Fix sys-devel/automake >= 1.12 compability wrt #420351
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

Revision  Changes    Path
1.337                gnome-extra/evolution-data-server/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog?rev=1.337&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog?rev=1.337&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog?r1=1.336&r2=1.337

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- ChangeLog	24 May 2012 13:53:26 -0000	1.336
+++ ChangeLog	20 Jun 2012 06:51:30 -0000	1.337
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.336 2012/05/24 13:53:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.337 2012/06/20 06:51:30 ssuominen Exp $
+
+  20 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  evolution-data-server-3.2.3-r2.ebuild:
+  Fix sys-devel/automake >= 1.12 compability wrt #420351
 
   24 May 2012; Samuli Suominen <ssuominen@gentoo.org>
   evolution-data-server-2.32.3-r2.ebuild:



1.2                  gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild?r1=1.1&r2=1.2

Index: evolution-data-server-3.2.3-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-data-server-3.2.3-r2.ebuild	7 May 2012 05:58:06 -0000	1.1
+++ evolution-data-server-3.2.3-r2.ebuild	20 Jun 2012 06:51:30 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-3.2.3-r2.ebuild,v 1.1 2012/05/07 05:58:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild,v 1.2 2012/06/20 06:51:30 ssuominen Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -91,6 +91,13 @@
 	# fix Google calendar event adding, bug #412829
 	epatch "${FILESDIR}/${P}-google-calendar.patch"
 
+	# Fix >=sys-devel/automake-1.12 compability wrt #420351
+	sed -i \
+		-e '/PROG_MKDIR_P/s:AM:AC:' \
+		-e 's:mkdir_p:MKDIR_P:' \
+		-e '/AM_INIT_AUTOMAKE/s:-Werror ::' \
+		m4/po.m4 po/Makefile.in.in configure.ac || die
+
 	eautoreconf
 
 	gnome2_src_prepare