Don't call elibtoolize multiple times or before eautoreconf (bug #403695, thanks to Kris Hepler for reporting).

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

4 files changed, 13 insertions, 13 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 99a8ca79ae18..2e041f11069b 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/pango
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.330 2012/01/30 09:45:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.331 2012/02/15 03:47:58 tetromino Exp $
+
+  15 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  pango-1.28.3-r1.ebuild, pango-1.28.4.ebuild, pango-1.29.4.ebuild:
+  Don't call elibtoolize multiple times or before eautoreconf (bug #403695,
+  thanks to Kris Hepler for reporting).
 
   30 Jan 2012; Pacho Ramos <pacho@gentoo.org> pango-1.29.4.ebuild:
   REQUIRED_USE='doc? ( X )' due upstream bug #643802, move gnome2_src_prepare to
diff --git a/x11-libs/pango/pango-1.28.3-r1.ebuild b/x11-libs/pango/pango-1.28.3-r1.ebuild
index 74775bd153ca..73c14779e910 100644
--- a/x11-libs/pango/pango-1.28.3-r1.ebuild
+++ b/x11-libs/pango/pango-1.28.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.3-r1.ebuild,v 1.9 2011/03/19 18:18:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.3-r1.ebuild,v 1.10 2012/02/15 03:47:58 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -52,8 +52,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# make config file location host specific so that a 32bit and 64bit pango
 	# wont fight with each other on a multilib system.  Fix building for
 	# emul-linux-x86-gtklibs
@@ -68,7 +66,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.28.3-malloc-failure.patch"
 
 	eautoreconf
-	elibtoolize # for Darwin bundles
+	gnome2_src_prepare
 }
 
 src_install() {
diff --git a/x11-libs/pango/pango-1.28.4.ebuild b/x11-libs/pango/pango-1.28.4.ebuild
index 06378e1ffecf..1c6d9dd86398 100644
--- a/x11-libs/pango/pango-1.28.4.ebuild
+++ b/x11-libs/pango/pango-1.28.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.14 2011/07/11 00:05:28 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.15 2012/02/15 03:47:58 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -54,8 +54,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# make config file location host specific so that a 32bit and 64bit pango
 	# wont fight with each other on a multilib system.  Fix building for
 	# emul-linux-x86-gtklibs
@@ -64,7 +62,7 @@ src_prepare() {
 		eautoreconf
 	fi
 
-	elibtoolize # for Darwin bundles
+	gnome2_src_prepare
 }
 
 pkg_postinst() {
diff --git a/x11-libs/pango/pango-1.29.4.ebuild b/x11-libs/pango/pango-1.29.4.ebuild
index fff617c7ee9e..2e8dc9b35029 100644
--- a/x11-libs/pango/pango-1.29.4.ebuild
+++ b/x11-libs/pango/pango-1.29.4.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-libs/pango/pango-1.29.4.ebuild,v 1.2 2012/01/30 09:45:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.29.4.ebuild,v 1.3 2012/02/15 03:47:58 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -67,7 +67,6 @@ src_prepare() {
 		eautoreconf
 	fi
 
-	elibtoolize # for Darwin bundles
 	gnome2_src_prepare
 }