diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-10-16 21:45:05 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-10-16 21:45:05 +0000 |
| commit | e1846707eb6b373cf7ff22c274a61daf87789eba (patch) | |
| tree | 6a660f0cfaa599b2421a0fa428359eaefd16ba36 /x11-themes/gnome-icon-theme | |
| parent | --without-mask (diff) | |
| download | gentoo-2-e1846707eb6b373cf7ff22c274a61daf87789eba.tar.gz gentoo-2-e1846707eb6b373cf7ff22c274a61daf87789eba.tar.bz2 gentoo-2-e1846707eb6b373cf7ff22c274a61daf87789eba.zip | |
Add workaround for people experiencing AM_INIT_AUTOMAKE version mismatch error (bugs #438296, #432376). (The root cause is probably in autotools.eclass - see bug #419933.)
(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)
Diffstat (limited to 'x11-themes/gnome-icon-theme')
| -rw-r--r-- | x11-themes/gnome-icon-theme/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-themes/gnome-icon-theme/gnome-icon-theme-3.2.1.2.ebuild | 5 | ||||
| -rw-r--r-- | x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/x11-themes/gnome-icon-theme/ChangeLog b/x11-themes/gnome-icon-theme/ChangeLog index d956b93bccf5..5d70f14bd46f 100644 --- a/x11-themes/gnome-icon-theme/ChangeLog +++ b/x11-themes/gnome-icon-theme/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-themes/gnome-icon-theme # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.221 2012/10/16 04:56:35 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.222 2012/10/16 21:45:05 tetromino Exp $ + + 16 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + gnome-icon-theme-3.2.1.2.ebuild, gnome-icon-theme-3.4.0.ebuild: + Add workaround for people experiencing AM_INIT_AUTOMAKE version mismatch + error (bugs #438296, #432376). (The root cause is probably in + autotools.eclass - see bug #419933.) 16 Oct 2012; Anthony G. Basile <blueness@gentoo.org> gnome-icon-theme-3.4.0.ebuild: diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.2.1.2.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.2.1.2.ebuild index 3548222356e4..b32d2d24249f 100644 --- a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.2.1.2.ebuild +++ b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.2.1.2.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/x11-themes/gnome-icon-theme/gnome-icon-theme-3.2.1.2.ebuild,v 1.9 2012/05/14 04:47:46 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-3.2.1.2.ebuild,v 1.10 2012/10/16 21:45:05 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -50,6 +50,7 @@ src_prepare() { # Revert upstream commit that is wrongly updating icon cache, upstream bug #642449 EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.91.7-update-cache.patch" - intltoolize --force --copy --automake || die "intltoolize failed" + + eaclocal --force # workaround for weird autotools.eclass bug #438296, #419933 eautoreconf } diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild index 00daaca94ce1..88f1fff89873 100644 --- a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild +++ b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.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/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild,v 1.8 2012/10/16 04:56:35 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild,v 1.9 2012/10/16 21:45:05 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -50,6 +50,7 @@ src_prepare() { # Revert upstream commit that is wrongly updating icon cache, upstream bug #642449 EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.91.7-update-cache.patch" - intltoolize --force --copy --automake || die "intltoolize failed" + + eaclocal --force # workaround for weird autotools.eclass bug #438296, #419933 eautoreconf } |