diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-06-21 07:05:02 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-06-21 07:05:02 +0000 |
| commit | 807293f4dbeae85f09f384b80a18afe70d3a43c1 (patch) | |
| tree | 802788acbf5efdd81537eb1684e7aea4df70661e /mail-client | |
| parent | marked x86 per bug 422079 (diff) | |
| download | gentoo-2-807293f4dbeae85f09f384b80a18afe70d3a43c1.tar.gz gentoo-2-807293f4dbeae85f09f384b80a18afe70d3a43c1.tar.bz2 gentoo-2-807293f4dbeae85f09f384b80a18afe70d3a43c1.zip | |
Fix sys-devel/automake >= 1.12 compability wrt #421307
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/evolution/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-client/evolution/evolution-3.2.3-r1.ebuild | 24 |
2 files changed, 21 insertions, 9 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog index 2902ff7357c9..17f130d958d1 100644 --- a/mail-client/evolution/ChangeLog +++ b/mail-client/evolution/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-client/evolution # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.366 2012/05/24 13:56:55 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.367 2012/06/21 07:05:02 ssuominen Exp $ + + 21 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> + evolution-3.2.3-r1.ebuild: + Fix sys-devel/automake >= 1.12 compability wrt #421307 24 May 2012; Samuli Suominen <ssuominen@gentoo.org> evolution-2.32.3-r1.ebuild: diff --git a/mail-client/evolution/evolution-3.2.3-r1.ebuild b/mail-client/evolution/evolution-3.2.3-r1.ebuild index 4df09a5d4e9c..3376312c0210 100644 --- a/mail-client/evolution/evolution-3.2.3-r1.ebuild +++ b/mail-client/evolution/evolution-3.2.3-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.3-r1.ebuild,v 1.2 2012/05/04 08:42:21 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.3-r1.ebuild,v 1.3 2012/06/21 07:05:02 ssuominen Exp $ -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" +EAPI=4 +GCONF_DEBUG=no +GNOME2_LA_PUNT=yes PYTHON_DEPEND="python? 2:2.5" inherit autotools eutils flag-o-matic gnome2 python @@ -137,12 +137,20 @@ pkg_setup() { src_prepare() { # https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf - epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch" + epatch "${FILESDIR}"/${PN}-3.2.1-reorder-mx-clutter-gtk.patch # Fix build failure with glib-2.32 - epatch "${FILESDIR}/${P}-gmodule-explicit.patch" - epatch "${FILESDIR}/${P}-g_thread_init.patch" + epatch "${FILESDIR}"/${P}-gmodule-explicit.patch + epatch "${FILESDIR}"/${P}-g_thread_init.patch # Fix crashes and linking failure with gtkhtml-4.4 - epatch "${FILESDIR}/${P}-gtkhtml-4.4.patch" + epatch "${FILESDIR}"/${P}-gtkhtml-4.4.patch + + # Fix >=sys-devel/automake-1.12 compability wrt #421307 + 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 |