Inherit toolchain-funcs explicitly. Quote WORKDIR.

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

10 files changed, 36 insertions, 30 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index d7f4df8697cf..b67fece95e08 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/file
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.215 2011/12/31 08:28:00 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.216 2012/02/02 01:35:39 floppym Exp $
+
+  02 Feb 2012; Mike Gilbert <floppym@gentoo.org> file-5.05.ebuild,
+  file-5.06.ebuild, file-5.07-r1.ebuild, file-5.07-r2.ebuild,
+  file-5.07-r3.ebuild, file-5.07.ebuild, file-5.08.ebuild, file-5.09.ebuild,
+  file-5.10.ebuild:
+  Inherit toolchain-funcs explicitly. Quote WORKDIR.
 
   31 Dec 2011; Mike Frysinger <vapier@gentoo.org> file-5.09.ebuild:
   Mark ppc/ppc64 stable #393291.
diff --git a/sys-apps/file/file-5.05.ebuild b/sys-apps/file/file-5.05.ebuild
index 9d59bb9f0cf5..26f8d26e0f27 100644
--- a/sys-apps/file/file-5.05.ebuild
+++ b/sys-apps/file/file-5.05.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-apps/file/file-5.05.ebuild,v 1.10 2011/04/07 20:41:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.05.ebuild,v 1.11 2012/02/02 01:35:39 floppym Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? *"
diff --git a/sys-apps/file/file-5.06.ebuild b/sys-apps/file/file-5.06.ebuild
index 93592b9c9bb7..ae69b847f391 100644
--- a/sys-apps/file/file-5.06.ebuild
+++ b/sys-apps/file/file-5.06.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-apps/file/file-5.06.ebuild,v 1.1 2011/04/15 08:04:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.06.ebuild,v 1.2 2012/02/02 01:35:39 floppym Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? *"
diff --git a/sys-apps/file/file-5.07-r1.ebuild b/sys-apps/file/file-5.07-r1.ebuild
index 7c74ff7e8d5b..1905ca669830 100644
--- a/sys-apps/file/file-5.07-r1.ebuild
+++ b/sys-apps/file/file-5.07-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-apps/file/file-5.07-r1.ebuild,v 1.1 2011/05/21 06:37:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.07-r1.ebuild,v 1.2 2012/02/02 01:35:39 floppym Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? *"
diff --git a/sys-apps/file/file-5.07-r2.ebuild b/sys-apps/file/file-5.07-r2.ebuild
index f0166e8079ce..6c7d49abff1e 100644
--- a/sys-apps/file/file-5.07-r2.ebuild
+++ b/sys-apps/file/file-5.07-r2.ebuild
@@ -1,13 +1,13 @@
-# 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-apps/file/file-5.07-r2.ebuild,v 1.1 2011/06/06 23:50:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.07-r2.ebuild,v 1.2 2012/02/02 01:35:39 floppym Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? *"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="*-jython"
 
-inherit eutils distutils libtool flag-o-matic
+inherit eutils distutils libtool flag-o-matic toolchain-funcs
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -36,7 +36,7 @@ src_prepare() {
 
 usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
 
-wd() { echo ${WORKDIR}/build-${CHOST}; }
+wd() { echo "${WORKDIR}"/build-${CHOST}; }
 do_configure() {
 	ECONF_SOURCE=${S}
 
diff --git a/sys-apps/file/file-5.07-r3.ebuild b/sys-apps/file/file-5.07-r3.ebuild
index 341ac058ce27..bf00ef4d6e0b 100644
--- a/sys-apps/file/file-5.07-r3.ebuild
+++ b/sys-apps/file/file-5.07-r3.ebuild
@@ -1,13 +1,13 @@
-# 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-apps/file/file-5.07-r3.ebuild,v 1.6 2011/08/09 13:37:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.07-r3.ebuild,v 1.7 2012/02/02 01:35:39 floppym Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? *"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="*-jython"
 
-inherit eutils distutils libtool flag-o-matic
+inherit eutils distutils libtool flag-o-matic toolchain-funcs
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -37,7 +37,7 @@ src_prepare() {
 
 usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
 
-wd() { echo ${WORKDIR}/build-${CHOST}; }
+wd() { echo "${WORKDIR}"/build-${CHOST}; }
 do_configure() {
 	ECONF_SOURCE=${S}
 
diff --git a/sys-apps/file/file-5.07.ebuild b/sys-apps/file/file-5.07.ebuild
index 1b59f39efb1c..8ce926fa0eae 100644
--- a/sys-apps/file/file-5.07.ebuild
+++ b/sys-apps/file/file-5.07.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-apps/file/file-5.07.ebuild,v 1.1 2011/05/11 03:43:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.07.ebuild,v 1.2 2012/02/02 01:35:39 floppym Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? *"
diff --git a/sys-apps/file/file-5.08.ebuild b/sys-apps/file/file-5.08.ebuild
index 0c2534518487..38cc71a61fe7 100644
--- a/sys-apps/file/file-5.08.ebuild
+++ b/sys-apps/file/file-5.08.ebuild
@@ -1,13 +1,13 @@
-# 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-apps/file/file-5.08.ebuild,v 1.2 2011/08/04 10:54:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.08.ebuild,v 1.3 2012/02/02 01:35:39 floppym Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? *"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="*-jython"
 
-inherit eutils distutils libtool flag-o-matic
+inherit eutils distutils libtool flag-o-matic toolchain-funcs
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -34,7 +34,7 @@ src_prepare() {
 
 usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
 
-wd() { echo ${WORKDIR}/build-${CHOST}; }
+wd() { echo "${WORKDIR}"/build-${CHOST}; }
 do_configure() {
 	ECONF_SOURCE=${S}
 
diff --git a/sys-apps/file/file-5.09.ebuild b/sys-apps/file/file-5.09.ebuild
index ad99b904877d..46da2da1aeae 100644
--- a/sys-apps/file/file-5.09.ebuild
+++ b/sys-apps/file/file-5.09.ebuild
@@ -1,13 +1,13 @@
-# 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-apps/file/file-5.09.ebuild,v 1.7 2011/12/31 08:28:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.09.ebuild,v 1.8 2012/02/02 01:35:39 floppym Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? *"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="*-jython"
 
-inherit eutils distutils libtool flag-o-matic
+inherit eutils distutils libtool flag-o-matic toolchain-funcs
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -33,7 +33,7 @@ src_prepare() {
 
 usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
 
-wd() { echo ${WORKDIR}/build-${CHOST}; }
+wd() { echo "${WORKDIR}"/build-${CHOST}; }
 do_configure() {
 	ECONF_SOURCE=${S}
 
diff --git a/sys-apps/file/file-5.10.ebuild b/sys-apps/file/file-5.10.ebuild
index 962e58e9997d..e8e145f0299d 100644
--- a/sys-apps/file/file-5.10.ebuild
+++ b/sys-apps/file/file-5.10.ebuild
@@ -1,13 +1,13 @@
-# 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-apps/file/file-5.10.ebuild,v 1.1 2011/12/31 06:00:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.10.ebuild,v 1.2 2012/02/02 01:35:39 floppym Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? *"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="*-jython"
 
-inherit eutils distutils libtool flag-o-matic
+inherit eutils distutils libtool flag-o-matic toolchain-funcs
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -31,7 +31,7 @@ src_prepare() {
 	mv python/README{,.python}
 }
 
-wd() { echo ${WORKDIR}/build-${CHOST}; }
+wd() { echo "${WORKDIR}"/build-${CHOST}; }
 do_configure() {
 	ECONF_SOURCE=${S}