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, 60 insertions, 20 deletions

diff --git a/sys-fs/fuse-exfat/ChangeLog b/sys-fs/fuse-exfat/ChangeLog
index e9890842ee2e..dcf56e9d2250 100644
--- a/sys-fs/fuse-exfat/ChangeLog
+++ b/sys-fs/fuse-exfat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/fuse-exfat
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse-exfat/ChangeLog,v 1.7 2012/12/12 11:15:54 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse-exfat/ChangeLog,v 1.8 2013/01/09 19:23:14 vapier Exp $
+
+  09 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/fuse-exfat-0.9.8-build-vars.patch, fuse-exfat-0.9.8-r1.ebuild:
+  Fix cross-compiling -- patch already in upstream.
 
   12 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> -fuse-exfat-0.9.7.ebuild,
   -fuse-exfat-0.9.8.ebuild:
@@ -34,4 +38,3 @@
 
   14 Jun 2011; Samuli Suominen <ssuominen@gentoo.org> +fuse-exfat-0.9.5.ebuild:
   Initial commit wrt #371587 by Azamat H. Hackimov
-
diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest
index 4d2d919a2909..ec17c975d45a 100644
--- a/sys-fs/fuse-exfat/Manifest
+++ b/sys-fs/fuse-exfat/Manifest
@@ -2,18 +2,25 @@
 Hash: SHA256
 
 AUX 99-exfat.rules 55 SHA256 2d5408d03d33bcb4baba3f42160364ae92ee0d0408e16f73754e0a48ec5541dd SHA512 d7c743719e29c32e271880b09797e8b5383a1c95195d5f0ec418a193dea27ec51845a52e9d39a711ec577ab0146883d57e5fec74e6a4d67b7e4c3cd595f77a69 WHIRLPOOL 70452c6f6edf02a0fbf1d45817aeb8f54df758bac0860e41c239b2bb7cae7321b0ee8c7c7191fd4d1055dbb2b94fbba17a3163b8513163e130c3febeb30e2cbc
+AUX fuse-exfat-0.9.8-build-vars.patch 752 SHA256 ebbddeec420943166dc397b40486e4d82abac80bf385dbc5f7735c1d5bc71ff4 SHA512 fe567df19053909120d6f36a05d97a0945cad0ef1ad2388da6911cde77f06c18f5981294e3a68e3d200972c0233659f5f69b50328cb7af95fca5ca9afcfa7554 WHIRLPOOL b4d8c5ad4abaed381f1a01d4a2c623ae23846e33945c798cb661f91b705c08b910b08bfc78f41478ea9c6a7f9eea4c644c52047eed3f45201cf1cd0910e0e177
 DIST fuse-exfat-0.9.8.tar.gz 38286 SHA256 ecae22203461e508d53389617c17d22f68c1b565c700d7663ce67bc4a710e903 SHA512 70b74b896131d41bf7693c7495a99cf943dbaccb61499beb38a474ff09f06213b3ca2ae32907c94795e6f05c3c681ec5db10414283603f666145787e030b1694 WHIRLPOOL 3d45f70833326baa12e245d3304084c239a5feead52a6956b2634c8f1508ceed9a606962e0602b01870fb2106a0544ee0c59803ac2d64018270009fcdc56e4fd
-EBUILD fuse-exfat-0.9.8-r1.ebuild 772 SHA256 4285c0fdde18df72c41b6db48b03df3fb518a62d0414960547fecd7aa7952701 SHA512 dd48316bec467668355c89ba516a4f10d9bcbe27595173f84aa4d51b916671361ea48c951f937a3192ac446c08ab6457d61aa9391ec0090cee4cc5da4a5d7ac2 WHIRLPOOL 2bf6e830758e9fa22a2e7f45b78aecaf7d8e372910132da704ce6b4b01514786c96ee8043467f9196e1357d36abc565e4207d04f359c82c95aa22444bfa3384a
-MISC ChangeLog 1396 SHA256 4f7c5103a2eb23cae444c6ebebdd3ec953c73a4c5f9b6adf729ef51b78e0e720 SHA512 8e1dfc2c1fa8fa15c1efc226ba7f6a632627f98f18b41430f594172f6d4dbe191934ea9035ca051ba7888888157eeeef2349ffdb70fd994c15f822b3efb50210 WHIRLPOOL 5754ca1f5c971ea0475daf728a0abadd3993b10470c7dc76dfaaf2e7436cedfd190026507393d6250e20657c1942daa1ff416056ddbb29764c196ffc33077b46
+EBUILD fuse-exfat-0.9.8-r1.ebuild 841 SHA256 1348e29b279fc720414fe093d912091bcb7524a210265801d6d3b84720932fce SHA512 5d919075c51cb53a7da417f113c1ac77fbdce60dbe43301483d3ab05b193d27a29c6bc15b5e8efccd25aef86e5bda05f7893c6f0be58017208a97ad6a7fc2d67 WHIRLPOOL c2da2ebaec577a965fc699780c44a06b6a096366d483c58ccf09961f705c2f9e8a48ef071f69237c36205b0475a0b8a03f8d8aeeba9f9c0bfec6d1e0041240e2
+MISC ChangeLog 1567 SHA256 b81593c1593609d0e745e5639377a769538a9c5071d2b06c90a956a95934881f SHA512 0dfec4b730aee50d5efa2e97b8de070562b54eb51441cd86cdd442724f20da7e3572a132e635580ab7218a2180bc231ccb83302dd32de07d212daf320bcbbfd7 WHIRLPOOL 0829e5e706aac826cb05712a13583eceb319827667b42ef5938526a4ba4f57db6e2705db985574c34aa85e8e79af01ce8bc6cfb9af2002c9b508c283cda6098f
 MISC metadata.xml 338 SHA256 317a755d9c1030ff5a40e94154d052ed14e6bb0894287805319804eef05df68a SHA512 0067c955d38e87f0502dc6ac2bc8b9f50625d84d66e7d316109125685c05cc9de8d062058b78c26a784ceb97c5ad42b3e70efcdf36911a5060551b97b25fc736 WHIRLPOOL 0ddb58db1c9bcaf942b277f2092d07dfc0f08a4dffc75a6fe25dfc1739e83129c0cce8ebc11ab4fef8bbd473432373e8f7c8a0a8738066a9dd7f37fa115fb78e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQyGdrAAoJEEdUh39IaPFNrSQH/3o7bM1HcqDSTvMQn3lT826R
-PrNAoiUGBxha8g75avThfRwyhTrg27LTF6QvwD0EBFr3KgJAO7z/7MyeHJRoa0V3
-wvB9flRyibnsnytHwpHTMhRvA36zlhx+nfRse1hA5EzrklIsiMtcMkLfcWEjVfg+
-xh7ROn3BoYYJ9JjRTG+YDRI2c0BZL5yyDNjybeG2y9O9kwjJ6PMyxjMXfjvePQ9p
-ZLn4Zmfzy1+/Nac/Rso6dUya1kdTCvhIN1IIzzRzv57iJTLnpHdmwSLHB0gsj8V0
-tFu6QnXZFaxFKdW3ouKk1dBUV7LVq90J2xtsSCXYTigfz5Z9Y3I7XZwjQCux9TI=
-=5mwz
+iQIcBAEBCAAGBQJQ7cQ9AAoJELEHsLL7fEFWU+QP/j3/7UAoVONrAhwcAruMOOvo
+GU6WnU6egvRqMMX9SuwMgKJiDpvnvitFWdIfR3YJxIPFD1rJhSsF2zdvug1/0JFd
+Zg4wTIvYOHd4Bn8NgBlKxkWL+Ygz7gR0Zgj/I+OSFNckL0Vl5yDzKzEfVVXOKZ8u
+UOsbuzPgf7/2e7EivxuxnEzpKD1Wo3OOmVJ63YKeVTasypDTbKikmuyfWW0c1BDW
+3T7l9FLUV4eXh6jda2VxcX/Zvs77n4x8Q23+A2cTwueWyrfsu18FpNGtCLYTrDDV
+SLyWo3Q5qazCK2WB1WRYuVervN0owWdPEZEHW9W1lDfNSBfIgNcuPhW4A7k639XT
+UA4OLXe1CRXJ8qD4fN7ibLxBJTxJeDma53AZaQOEL3OW3+2CjmE2/kDPifWkYtov
+J22jOmAmwrF+MkltcV6sHhxaHxMKmfudafTUWTr/yNoy0+rVwp3lGtoRNoefF0WS
+1cpLktRAAHsDtbAjm+0YMCLc1RHq974R6AHSKto96APITWjLQCNgIrgSPOKyiIkG
+s4CFHizJp3v3BTpJTuDxUUO8iats5lPz0eMMbCEoH7okbcOSE6qFmjZKAXtjVWkk
+MgOjViypTVwpn3d3v8+WGzcd1iJngLXIGG75lfKvdU+Y+JgRlRLSxVOvOhW9TfRr
+eLWwhRdmF/DVdPEbjg7Y
+=nQ9x
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/fuse-exfat/files/fuse-exfat-0.9.8-build-vars.patch b/sys-fs/fuse-exfat/files/fuse-exfat-0.9.8-build-vars.patch
new file mode 100644
index 000000000000..2f0b1ade4645
--- /dev/null
+++ b/sys-fs/fuse-exfat/files/fuse-exfat-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()
diff --git a/sys-fs/fuse-exfat/fuse-exfat-0.9.8-r1.ebuild b/sys-fs/fuse-exfat/fuse-exfat-0.9.8-r1.ebuild
index 39d84322686f..5582a14bdad0 100644
--- a/sys-fs/fuse-exfat/fuse-exfat-0.9.8-r1.ebuild
+++ b/sys-fs/fuse-exfat/fuse-exfat-0.9.8-r1.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/fuse-exfat/fuse-exfat-0.9.8-r1.ebuild,v 1.3 2012/12/11 18:26:24 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse-exfat/fuse-exfat-0.9.8-r1.ebuild,v 1.4 2013/01/09 19:23:14 vapier Exp $
 
 EAPI=4
-inherit scons-utils udev toolchain-funcs
+inherit scons-utils udev toolchain-funcs eutils
 
 DESCRIPTION="exFAT filesystem FUSE module"
 HOMEPAGE="http://code.google.com/p/exfat/"
@@ -11,16 +11,19 @@ SRC_URI="http://exfat.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~arm ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="sys-fs/fuse"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.8-build-vars.patch
+}
 
 src_compile() {
-	tc-export CC
-	escons CCFLAGS="${CFLAGS}" || die
+	tc-export AR CC RANLIB
+	escons CCFLAGS="${CFLAGS}"
 }
 
 src_install() {