summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-20 06:51:30 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-20 06:51:30 +0000
commitf45c68fe3b45b3ceb1903002f77d75b1a8dd90e4 (patch)
treec1fe6ba291f162e65d7c63fecc92642358601833 /gnome-extra/evolution-data-server
parentRemove old wrt bug 421987. (diff)
downloadgentoo-2-f45c68fe3b45b3ceb1903002f77d75b1a8dd90e4.tar.gz
gentoo-2-f45c68fe3b45b3ceb1903002f77d75b1a8dd90e4.tar.bz2
gentoo-2-f45c68fe3b45b3ceb1903002f77d75b1a8dd90e4.zip
Fix sys-devel/automake >= 1.12 compability wrt #420351
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/evolution-data-server')
-rw-r--r--gnome-extra/evolution-data-server/ChangeLog6
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild9
2 files changed, 13 insertions, 2 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 3e66543ee976..efc9be9c0b94 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -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:
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild
index 8a8906da2eab..721b8f241597 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild
@@ -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 @@ src_prepare() {
# 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