From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 14 Oct 2011 20:28:29 +0000 (+0000)
Subject: Use elibtoolize from libtool.eclass to fix libtool magic.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18ee83cf318919aa6e306c1182aed9d5ef72a2e8;p=gentoo.git

Use elibtoolize from libtool.eclass to fix libtool magic.

We're calling it with '--patch-only' to avoid heavy changes to ebuilds.
This should handle gracefully eautoreconfed packages and those not using
libtool as well (in worst case, it should try to apply patches twice).
---

diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index bae95a1ae592..bf9c9ac97b21 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.24 2011/09/23 07:56:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.25 2011/10/14 20:28:29 mgorny Exp $
 
 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@@ -89,7 +89,7 @@ case ${EAPI:-0} in
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
-inherit autotools base eutils
+inherit autotools base eutils libtool
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
 
@@ -212,6 +212,7 @@ autotools-utils_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	base_src_prepare
+	elibtoolize --patch-only
 }
 
 # @FUNCTION: autotools-utils_src_configure