From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Sun, 9 Oct 2005 13:01:41 +0000 (+0000)
Subject: Check if the freebsd patch was already applied when it fails to apply.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=54d97e2b3972c79b3aebe0591c6081b9cb4ef261;p=gentoo.git

Check if the freebsd patch was already applied when it fails to apply.
---

diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index 83190076f2a8..57d48e7d326b 100644
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.60 2005/10/04 15:48:05 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.61 2005/10/09 13:01:41 flameeyes Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -198,7 +198,7 @@ elibtoolize() {
 		local opts
 		[[ -f Makefile.am ]] && opts="--automake"
 		glibtoolize --copy --force ${opts}
-		
+
 		elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
 	fi
 
@@ -323,8 +323,10 @@ elibtoolize() {
 						;;
 					"fbsd-"*)
 						if [[ ${CHOST} == *"-freebsd"* ]] ; then
-							eerror "  FreeBSD patch set '${y}' failed to apply!"
-							die "FreeBSD patch set '${y}' failed to apply!"
+							if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' "${x}/configure") ]]; then
+								eerror "  FreeBSD patch set '${y}' failed to apply!"
+								die "FreeBSD patch set '${y}' failed to apply!"
+							fi
 						fi
 						;;
 					"darwin-"*)