Fix from Chromium OS for cross-compiling.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 38 insertions, 9 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index ff043ff3fa4c..8bbe2d6b83c4 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.270 2015/04/12 08:47:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.271 2015/05/15 09:23:57 vapier Exp $
+
+  15 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/sane-backends-1.0.24-cross-compile.patch,
+  sane-backends-1.0.24-r5.ebuild:
+  Fix from Chromium OS for cross-compiling.
 
   12 Apr 2015; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due to bug #353756
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index cdd98e951c71..d5c6f38696f8 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX niash_array_index.patch 4141 SHA256 a44687911c10e66c1a57efe73508d1c78eed55fa2699fe7e13c62ddc7b646187 SHA512 13dcba7d609cb5fe27442918818b46dd55b3d4c65aeb3f379377671775cf28f8cd48950a0633fb3abb33db29b223798c0b00a86a029956ae0bc323edc344d28f WHIRLPOOL c93d1c770e49550eb72f82f2a48385600b806531cc4e6072fa7317515c16ac7847acb63be7d8c94592fee299e433f438a2f7db82f362d7a57e79c42a2b13940b
 AUX sane-backends-1.0.24-automagic_systemd.patch 1310 SHA256 5461cb3aa8bad1b299cd92c525cf6af5a3af5a82e81a74549a7f660d026ee610 SHA512 1edf28a2d106cf05df92a55ef3bf4ea530c9ee69a2517f14a33a5ff30ba69702d818677da1715ab19169a4d5575f1c7c2755431193d48a40d4f80d11e6308120 WHIRLPOOL 9404f9938567bec86487969fa0e1af21cf83c8aa88344983c09a2380c279c3de7b9c4bcd8a41836ffc3ab9628bfe4f8a38c0c165f5d933adefc66fb589fdf5d6
+AUX sane-backends-1.0.24-cross-compile.patch 490 SHA256 a5fd96b561175a0bfb059f95c59031e4cc7fc2b5d4dc79da4e6738b789e9e1d6 SHA512 532941a47b8f1b2a475f0f0a42f2ab6d3f2015a1bef8bd63f532a76bc3f89c8364d9d627c124131b052615d661c5ce65ef1718ef112b6fbada779d39bcf81464 WHIRLPOOL 0ccd90c9135f773e41b9c84cc3df23a993bba17cd3bbd578803d055325e22beab7f06b3453cf94b1aa144bb82ee634c4e848d031b67e5035d0139bdda4504115
 AUX sane-backends-1.0.24-kodakaio_avahi.patch 2900 SHA256 83f2a75a379fd964e8662d61394dd61d674bfaf5d4cf13d12725af83aaa36f7e SHA512 c00c01d2b7ad1770117403373ece89b14ff58ed23b6719b01f89c381dd88a1195c6c57c1d3ca25d7036ea21128a36f14675e7bfae0e6db671db24fb4c1422674 WHIRLPOOL ee3be39baa2a33615308d1805d0c5f59ae6e1b4e72f481ef0629c71f94f4d26dbd06e2dca12a969e883f0453e07953c1bfbc8cbafc19dca16f5ec1e2c86ceaeb
 AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 SHA256 c95f305d01fd0dfb63944788f450d798a8882412f1d3e6da5c7e49f33cceba51 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24 WHIRLPOOL d72b314c7e4898c83a4c79e6fa39af978bd60e2b78afa58c1f8e1709b5f597292e965d330a58cd4109780fb2051dcd7880008f65d2b204fe476cbf3ce898e22b
 AUX sane-backends-1.0.24-systemd_pkgconfig.patch 1324 SHA256 8a6a253e5869d0a5e9d3296b9e7525c892a74b12e25c8945fffeb52521efeaa8 SHA512 1d503302ef60e7a16d764997768a1aca3cf2a0109fc53d9c353761354aad2b34caa3dc2763c343fe1af6544021ed9c288f0e951e2d10218a80fd9d081aabb5d5 WHIRLPOOL 8e4df791a67f859d9f1893301bc238f1cf26d8568ffbfdefd7321d8e0f87ce5b079a378788af58b42f4506e15cac6bf7607410df2b54dae9b815a83b2134c28f
@@ -11,13 +12,23 @@ AUX saned 150 SHA256 d18856d6dd26fac11988fea5217c8616686ad3c0c024ad5437efbf0fd24
 AUX saned.confd 76 SHA256 197e44ba1f438a18f5f7d9f5858feb19c1ece4286d82a5e63caf9be5b964aa76 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751 WHIRLPOOL ede920bf5eb1ee59263296a2ccce1ab2da2b04669c2f8a58de1fc4fa76cc1eee501290eb4fdaece464bc184cc0cfb17d100e9309a33d79c06142a3f03c91b837
 AUX saned.initd 411 SHA256 4dd4e7fa07bf2ab2d4f5753156f5df0ad2277523f6755b0eab3d2db3480989e2 SHA512 ec9c11c84dc405981fd854f99007a5fcae5403685894acd1d1108fc772147a54d9fad9103dcff708765efff644e972260459c19fe439af17db76562dc1b5ba84 WHIRLPOOL bec23753fc557a36a6990ed565519bb62e1bc9a6bd81c0c16cc956cd6dbc1c6fd661775b8c8bf05faa1f5bbbef2406498094a0adc48c9fd81e89f4531669c4e8
 DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5 WHIRLPOOL 19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c
-EBUILD sane-backends-1.0.24-r5.ebuild 7690 SHA256 92e10516c32d0d161062433dbf657f7d15d54df52805650417ae99f43723c600 SHA512 de33bf37156c965d485da323277142315d7de1b9844ac34fb8a48f53a1810a3635657f40563b6daef9ee66ccef2da18db68667dd9548db018c69d5bc24cb934f WHIRLPOOL cf1e3862316a02d1b327ace10d316d56c74cbf255994c3bd3ec272ac6bb28e9e973f96952f38a1e6650b5a7ebc099b42404d12088026b631ca6cc925c05d5f79
-MISC ChangeLog 46322 SHA256 a15b8dfd20c38639b751c6b3ef14318d0c2b3339cb8222d5d291056f73bd5dca SHA512 07af00bca91fb4d0ba23e9165360fba76e6e651066a7a603008ed2f54e1e9ae22c1c6e2a3aac02dac7272a586015437352a38644103a289eb5a20f84a5c3959d WHIRLPOOL 7d71f7f53ed381198d922fb771a94377603c8b7dd1908654fd0310b21a20c6ca87950b9db8758761f27cc650477515c39fe00e2a478883f1f5ff4bf949943b4b
+EBUILD sane-backends-1.0.24-r5.ebuild 7736 SHA256 c5eb8693b77737ce43fb64ff253fc7f56661a6dc166cf8557f4a842b124f8b7f SHA512 f50d72c1c225b4c4e1bfd141793f64f79f10c33cbe52a5356f6944def1a785c8c70184489e035f021a6f37b43fd0fe8dd656cdddd45c8cf322aa5cc84ff58dce WHIRLPOOL 91b061da5de7e0497e53e851d86f06545691f7af68e1449bec42ffd91b943cf8ec69144c25c1bd0d8c3eaa5c31100050a8b49bc420db91317a49179151f915a8
+MISC ChangeLog 46503 SHA256 30e373f0207cc1ced52a959cf6bba586707f784775cc7a8fb2467a9174f80e2a SHA512 d518b8aed32169468dbf5ce0150676c36e4d95ee2cafc6e7a11127cfc420605ce4b9f81be7b65ee22f6f24119b738e690da89470bd7b1f7db34a2faf37397dd1 WHIRLPOOL aa13ec5a6179686b561746024ee1ce7b6bd9bd54323e5243e5c3eaff2d3a7881ecd8783e2ecf2eb6fdf07a314cc034f24d6ecf71f11f4531783e055e9e11392e
 MISC metadata.xml 212 SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 SHA512 85ac7770baae8cc7c2c52dcd077a448cfb394ec6585e274ffa01c8f92a862d22c6ba0553b71cf2ae6b6f28f6faa5c3d615537f35f9fe0da9f43a2c9043953784 WHIRLPOOL 221b2f4e9b984954eb7268028287339e8678c794c7b4e40ab2baaa037c8e87bac30c8b64473efade9b3ee1ce226aab4ad36760147eee5af7cfd7c081473c839b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUqMQYACgkQCaWpQKGI+9QtHACfRNTjAMve7gHbiNAHMKT93Suw
-odsAn32JDFg3E9sIQfhIkU752VcxeGQO
-=uG9R
+iQIcBAEBCAAGBQJVVbsvAAoJEPGu1DbS6WIAeX8P/0HKLhMiVCuk/tigpDeaRKij
+h1Pmy2750BaxIvvCs3Kq0y4f4cn9gwqN/Phd9hyr5IVnnQhcVnM09MSXJnijXGY0
+HN5/FHzhSkSr7u9SChU4u4zWMJvy8+cYYukShO9gAzNH/v1xKterELW/DgZA6g+Q
+ZC+taXbUaCYK6b7idTMcmwv2DP0/5mtZvTk7P89dBchu/pBCUhwHUZNgSwVWrD20
+138fa4oFbkprJKWh1OtoQEMLTsRUx4fOGfGPK0EI7yU4pN6OmDn4zRpkkdNglF/E
+/aazNIt+M3+oce5viqXKWZUo+2DSQFh/tq8jY2s4P5/VCNb3EUfE8pZgJDjJngXx
+SEUYMlyRHSjWW8VoTYmXiF619sG+Xpv8Ly/FGm4PiPiKvsf0pjL8SX8xvBFD+XqP
+pw2LcoAMLZ85TzkqWJUT6iMdRcYLGRRPEkzQxCwbejbBO2qnRvP7h2UzYNpJgSxh
+yVAxezAlQDqjKFGjt6DancvwPaRclE954X0jYRpDhHgwoT/+GVqZZpYuzu4HfFms
+YECuE5xuAFInj6+y1Pb2WkQ7+AzY8PHP7V3I1n8YLfRONHscoR36+4AdA7svNWSe
+M47O2HzrdOOwnbhBd0CP/uSnBNamBLmSxeeKoA64efEh+qbYbVSt1QF6v0NfAKd+
+3bhrSXP1X/quapoyAPE/
+=PPEo
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch
new file mode 100644
index 000000000000..972bd61e492d
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.in b/configure.in
+index a91d584..7db972c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -82,7 +82,6 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
+ dnl ***********************************************************************
+ dnl set compiler/linker flags
+ dnl ***********************************************************************
+-INCLUDES="${INCLUDES} -I/usr/local/include"
+ AC_SUBST(INCLUDES)
+ SANE_SET_CFLAGS([$is_release])
+ SANE_SET_LDFLAGS
diff --git a/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild
index f9d81046f2c2..ce928f39e8c8 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild,v 1.11 2014/12/04 08:39:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild,v 1.12 2015/05/15 09:23:57 vapier Exp $
 
 EAPI="5"
 
@@ -183,7 +183,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-automagic_systemd.patch \
 		"${FILESDIR}"/${P}-systemd_pkgconfig.patch \
 		"${FILESDIR}"/${P}-kodakaio_avahi.patch \
-		"${FILESDIR}"/${P}-saned_pidfile_location.patch
+		"${FILESDIR}"/${P}-saned_pidfile_location.patch \
+		"${FILESDIR}"/${P}-cross-compile.patch
 	# Fix for "make check".
 	sed -i -e 's/sane-backends 1.0.24git/sane-backends 1.0.24/' testsuite/tools/data/html*
 	AT_NOELIBTOOLIZE=yes eautoreconf