From 539f6159b14cd0882621901f7fe07fee0611d6cd Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@chromium.org>
Date: Tue, 14 Aug 2012 16:30:36 -0400
Subject: [PATCH] libtool: sync to latest upstream version

Upgraded sys-devel/libtool to version 2.4-r1 on amd64, arm, x86

We want the new version which no longer requires binutils.

BUG=chromium-os:21330
TEST=`cbuildbot {amd64,arm,x86}-generic-full` worked

Change-Id: Ie6adb636fbb08971cb02a0324a4c6c8147780b95
Reviewed-on: https://gerrit.chromium.org/gerrit/30292
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
---
 .../metadata/md5-cache/sys-devel/libtool-2.4-r1          | 6 +++---
 .../sys-devel/libtool/libtool-2.4-r1.ebuild              | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/libtool-2.4-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/libtool-2.4-r1
index 0524e041c2..fc0ba39635 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/libtool-2.4-r1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/libtool-2.4-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst preinst prepare unpack
-DEPEND=sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5 >=sys-devel/binutils-2.20 app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68
+DEPEND=sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5 test? ( !<sys-devel/binutils-2.20 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68
 DESCRIPTION=A shared library tool for developers
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/libtool/
-IUSE=vanilla
+IUSE=test vanilla
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.tar.xz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	33ef77a15337022e05342d2c772a7a5a	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=f9e5449400937d2371c4458fb6bea80a
+_md5_=2bcbcfd74e08e81449f113f841d67fa7
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4-r1.ebuild
index f3076903e2..9ae2c9d958 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4-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/sys-devel/libtool/libtool-2.4-r1.ebuild,v 1.9 2011/08/22 18:20:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4-r1.ebuild,v 1.11 2012/04/09 00:32:11 vapier Exp $
 
 EAPI="2" #356089
 
@@ -15,14 +15,14 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="vanilla"
+IUSE="test vanilla"
 
 RDEPEND="sys-devel/gnuconfig
 	!<sys-devel/autoconf-2.62:2.5
 	!<sys-devel/automake-1.11.1:1.11
 	!=sys-devel/libtool-2*:1.5"
 DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.20
+	test? ( !<sys-devel/binutils-2.20 )
 	app-arch/xz-utils"
 
 src_unpack() {
@@ -32,7 +32,6 @@ src_unpack() {
 
 src_prepare() {
 	if ! use vanilla ; then
-		epunt_cxx
 		cd libltdl/m4
 		epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105
 		cd ..