Fix cross-compiling -- patch already in upstream.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 57 insertions, 16 deletions

diff --git a/sys-fs/exfat-utils/ChangeLog b/sys-fs/exfat-utils/ChangeLog
index bf3419d829a3..3d2785ee5fcc 100644
--- a/sys-fs/exfat-utils/ChangeLog
+++ b/sys-fs/exfat-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/exfat-utils
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/exfat-utils/ChangeLog,v 1.5 2012/12/12 11:15:28 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/exfat-utils/ChangeLog,v 1.6 2013/01/09 23:02:36 vapier Exp $
+
+  09 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/exfat-utils-0.9.8-build-vars.patch, exfat-utils-0.9.8.ebuild:
+  Fix cross-compiling -- patch already in upstream.
 
   12 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   -exfat-utils-0.9.7.ebuild:
@@ -27,4 +31,3 @@
   14 Jun 2011; Samuli Suominen <ssuominen@gentoo.org>
   +exfat-utils-0.9.5.ebuild:
   Initial commit wrt #371589 by Azamat H. Hackimov
-
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index 3e368afcaede..3125c371aa1e 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -1,18 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX exfat-utils-0.9.8-build-vars.patch 752 SHA256 ebbddeec420943166dc397b40486e4d82abac80bf385dbc5f7735c1d5bc71ff4 SHA512 fe567df19053909120d6f36a05d97a0945cad0ef1ad2388da6911cde77f06c18f5981294e3a68e3d200972c0233659f5f69b50328cb7af95fca5ca9afcfa7554 WHIRLPOOL b4d8c5ad4abaed381f1a01d4a2c623ae23846e33945c798cb661f91b705c08b910b08bfc78f41478ea9c6a7f9eea4c644c52047eed3f45201cf1cd0910e0e177
 DIST exfat-utils-0.9.8.tar.gz 51557 SHA256 97d8c77e048d0fdc2e5425ff22a139306ce3f1575b58e56c26bb968930a423bb SHA512 bff817b3b886d0ea03439c55d6497336e880b4eb5298e06c7fe8c60216dc491d27df9258865232a71d1a59fe1b3cffb38191caea5aaa4ad8965e3526126a2a38 WHIRLPOOL 4fb52ee2aefcb59692dbc66530cae6d813b1497a9e5900c2c074452cc759770fd60b3bf3fb41cf146dc98ece1f065e5cf50443017739823761cdd30a2c2d6c9b
-EBUILD exfat-utils-0.9.8.ebuild 731 SHA256 c6d88d37932af7cfa76cc10ab26cfd8572160c625340bbdefc21bfd69b4844bb SHA512 b877e15ff2144e1c5abf455cf877b786113ef5de0fdeb82e49f7d34c475c07d212736adf25363a75d049a3a8bd6cbe2b271fc0df153a7b1ffd78a6c3b8c1fc7e WHIRLPOOL 36b1bc200f9d93ca5476932eb03f6a6163fd50c5ece80656e03b3f9541b046eb3f5b4fd92b04023e65af0e6a368ad3d6614000e645af374cda22a3485876c3db
-MISC ChangeLog 888 SHA256 a12a48892e38aa0e1fd07d74b3955030084599f2bd9b10bb1acf626df64f737d SHA512 30ed69e946d9cb6d9a503ca96b8ab278f2f1ab170eb38d348e3c1ef5199e992bd4f818c91191dc78c7f6814c2caa00f1129a06a2e9df182061f2c41f30db696e WHIRLPOOL b1853495ea3e8f0d0833db05c227a72238e7c06bf0c84eabb53afb1a02c31f37f9dba17dc1c07b772b44f19367c0ae5bebfd3466ecfc72518e5b68b7529807a0
+EBUILD exfat-utils-0.9.8.ebuild 798 SHA256 a13c928adb626bfdc184ec2c7344ad7c7774e43d5113fe2f769acb259766fcef SHA512 91678d8e1b12352b588690a04e66d72a50aa9dfbd1edb9c76c5493a55e181f7c50e084db2da8b3e6a797f30da8cf806d3b4395878cf153891350e1f2db32a3d8 WHIRLPOOL 243b112dd9384bfc8400afdf2eeac2013d05c6b5bafcab67962db1300e31163f4cfd054dfd5ae08c2c9180e6bf0825ac19533dd2316468855cfef4ec1ccad51b
+MISC ChangeLog 1058 SHA256 f3dbdf7214e1e26399c052d71f5c5c4701987d1d6db383f6b89c57af9a6d15f6 SHA512 72fbf562d3892ef5f0a751c425d799b5c46ed920199579c70d56000ff4f87dd3b7a5c83b6f5c2409768189eac951b2899d620dc43b60d7014c0f04509662a351 WHIRLPOOL ddb9591f09c39bf743af83e6e36565a4fc522ac8f9b3f71bba225ce1939e1d1a58200d1e4ef0abe0f7d0fcda57ebd42153f7905c438632037039d35b6ec4357b
 MISC metadata.xml 338 SHA256 317a755d9c1030ff5a40e94154d052ed14e6bb0894287805319804eef05df68a SHA512 0067c955d38e87f0502dc6ac2bc8b9f50625d84d66e7d316109125685c05cc9de8d062058b78c26a784ceb97c5ad42b3e70efcdf36911a5060551b97b25fc736 WHIRLPOOL 0ddb58db1c9bcaf942b277f2092d07dfc0f08a4dffc75a6fe25dfc1739e83129c0cce8ebc11ab4fef8bbd473432373e8f7c8a0a8738066a9dd7f37fa115fb78e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQyGdRAAoJEEdUh39IaPFNDFIH/0JtoO49YmmCBIIp7H775Wh3
-0usXA7yon9RN62t3/2fmydHzzboNd7M3lNbKRnR34Y3iP3EPNuCB96/WtbAA4gwT
-6/jz+pdT3JpECTjpyd+MFE+NdYB9RqfDuJJrm9LiubmuEiFUCCfJLA8TFYdwkpb3
-MiwAo7NlGiwozdg8PW7auptuakou/U8K3R86gSSTl6AlFCzvxcmxYtQAh1gIkRe7
-QAhpEyIKhuclEw3O5IRIbmDp24kH0WobSxg6BHxLcpRwxKad/aHb07/LMVhcdWMj
-AbSaxA8e4EcsboAcfD7rfAXwC3NgXJcOTgh8h8ExDUZkRmi4a/ViGrqz5yKv75E=
-=LmjA
+iQIcBAEBCAAGBQJQ7feoAAoJELEHsLL7fEFWBzYQALpCKbWhkc2LjIvZ3sybfidI
+8BuF998QeXyYyWi5HnaPwPLG4uXIAnbMDl1v4bJdnh1id2DhlJrBrs27QVjhRa7v
+H9lE2sMZ5cF+62yBhyqW+c1fdq9lkcBvVYOCJlr3Q8D2biWYno82/5Pbx5pgx1mJ
+W9pZrHHrrEe5W5c8sJbW/9AIi/kfcxz06BPzbpjZ6rjhlqf28QwGwwlLypGDKBLu
+9goj5PaMXfZmoO3WSYugiU5u1B3C1q3j++Li+MZrkh2lRQcf1EOSaXDnqHFrf6hR
+ABpt2K6yB9w19STs19cLYxz0gvCniP+nV8s6j9pT1nmlOUYGYLomOQHN3W9yaxYM
+DZlV+GOxWlFQ0Htor8P5gMtJqgaXLkJDaAEn5F4OAR0itZsgzunYImgY0yoEk3Yq
+JLzrw1tpIlMHQu7yaeB7EMTd5p/PkKve+2k7VgTRD22uLK/h5OIvvT83WYBkRMYx
+Wyk3tCux7Hwavf1bYSHH/2EUfmPqGBGbqT4kNDDOyDMMU0K1H9IDJWqAfrc1tp88
+/a2v9ApUWzrW4ivTROU8cQDptULwlUjk8nIDLjCP0gdvZhRgNSsJgaqX74bocvN4
+FGKWYIqU7Dc/3QHoF/JrUn4afOJVEngD812B8QRohIxbL2C8Cgg9OBNbfqhIdYWn
+QW3KHGW0my1OVMW3PNA8
+=KBx5
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/exfat-utils/exfat-utils-0.9.8.ebuild b/sys-fs/exfat-utils/exfat-utils-0.9.8.ebuild
index 6509f97b37ba..684fe6991348 100644
--- a/sys-fs/exfat-utils/exfat-utils-0.9.8.ebuild
+++ b/sys-fs/exfat-utils/exfat-utils-0.9.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/exfat-utils/exfat-utils-0.9.8.ebuild,v 1.1 2012/08/27 07:07:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/exfat-utils/exfat-utils-0.9.8.ebuild,v 1.2 2013/01/09 23:02:36 vapier Exp $
 
 EAPI=4
-inherit scons-utils toolchain-funcs
+inherit scons-utils toolchain-funcs eutils
 
 DESCRIPTION="exFAT filesystem utilities"
 HOMEPAGE="http://code.google.com/p/exfat/"
@@ -14,9 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.8-build-vars.patch
+}
+
 src_compile() {
 	tc-export CC
-	escons CCFLAGS="${CFLAGS}" || die
+	escons CCFLAGS="${CFLAGS}"
 }
 
 src_install() {
diff --git a/sys-fs/exfat-utils/files/exfat-utils-0.9.8-build-vars.patch b/sys-fs/exfat-utils/files/exfat-utils-0.9.8-build-vars.patch
new file mode 100644
index 000000000000..2f0b1ade4645
--- /dev/null
+++ b/sys-fs/exfat-utils/files/exfat-utils-0.9.8-build-vars.patch
@@ -0,0 +1,27 @@
+make sure we pass down important env vars
+
+https://groups.google.com/d/topic/exfat/BfRq9XU2kQM/discussion
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -29,6 +29,10 @@ destdir = env.get('DESTDIR', '/sbin');
+ targets = []
+ libs = ['exfat']
+ 
++if 'AR' in os.environ:
++	conf.env.Replace(AR = os.environ['AR'])
++if 'RANLIB' in os.environ:
++	conf.env.Replace(RANLIB = os.environ['RANLIB'])
+ if 'CC' in os.environ:
+ 	conf.env.Replace(CC = os.environ['CC'])
+ if 'CCFLAGS' in os.environ:
+@@ -74,6 +74,9 @@ if platform.system() == 'FreeBSD':
+ 	conf.env.Append(LIBPATH = ['/usr/local/lib'])
+ 
+ env = conf.Finish()
++for var in ('SYSROOT',):
++	if var in os.environ:
++		env['ENV'][var] = os.environ[var]
+ 
+ def make_symlink(dir, target, link_name):
+ 	workdir = os.getcwd()