summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2009-06-03 23:09:10 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2009-06-03 23:09:10 +0000
commitd0d2b9b7f4ff419cfdfcf60cb37fa3f9e3d1b108 (patch)
tree7f502be90459cba8b11a4857b036b07168296ab2 /gnome-base/gnome-panel
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-d0d2b9b7f4ff419cfdfcf60cb37fa3f9e3d1b108.tar.gz
gentoo-2-d0d2b9b7f4ff419cfdfcf60cb37fa3f9e3d1b108.tar.bz2
gentoo-2-d0d2b9b7f4ff419cfdfcf60cb37fa3f9e3d1b108.zip
libtool-2 screws us if we eautomake and micro version of installed automake is different leading to an unwanted eautoreconf, bug #271652.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-panel')
-rw-r--r--gnome-base/gnome-panel/ChangeLog7
-rw-r--r--gnome-base/gnome-panel/gnome-panel-2.26.2.ebuild8
2 files changed, 11 insertions, 4 deletions
diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index a9b81f69234d..533dde6037d4 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/gnome-panel
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.281 2009/05/28 22:20:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.282 2009/06/03 23:09:10 eva Exp $
+
+ 03 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org>
+ gnome-panel-2.26.2.ebuild:
+ libtool-2 screws us if we eautomake and micro version of installed
+ automake is different leading to an unwanted eautoreconf, bug #271652.
28 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+gnome-panel-2.26.2.ebuild:
diff --git a/gnome-base/gnome-panel/gnome-panel-2.26.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.26.2.ebuild
index 673ad5d50c28..bb8cba24dd23 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.26.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.26.2.ebuild
@@ -1,10 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.26.2.ebuild,v 1.1 2009/05/28 22:20:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.26.2.ebuild,v 1.2 2009/06/03 23:09:10 eva Exp $
EAPI="2"
GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.10"
inherit autotools eutils gnome2
@@ -93,7 +92,10 @@ src_prepare() {
-i gtk-doc.make || die "sed 2 failed"
fi
- AT_M4DIR="m4" eautomake
+ # Make it libtool-1 compatible, bug #271652
+ rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
+
+ AT_M4DIR="m4" eautoreconf
}
pkg_postinst() {