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

diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index 83190076f2a89a759e31950d1f439e1d0a0d5d59..57d48e7d326b41a39d83c153d33f88eede2f2269 100644 (file)
--- 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-"*)