Fix from Chromium OS for cross-compiling.

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

4 files changed, 41 insertions, 20 deletions

diff --git a/net-libs/neon/ChangeLog b/net-libs/neon/ChangeLog
index b8d6854a014d..c259a936022d 100644
--- a/net-libs/neon/ChangeLog
+++ b/net-libs/neon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/neon
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/neon/ChangeLog,v 1.93 2014/12/06 16:41:07 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/neon/ChangeLog,v 1.94 2015/05/16 07:56:57 vapier Exp $
+
+  16 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/neon-0.30.1-xml2-config.patch, neon-0.30.1.ebuild:
+  Fix from Chromium OS for cross-compiling.
 
   06 Dec 2014; Agostino Sarubbo <ago@gentoo.org> neon-0.30.1.ebuild:
   Stable for ia64, wrt bug #529718
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 623ca05c9333..88be46554133 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX neon-0.30.1-xml2-config.patch 587 SHA256 e40bd6f27d10dfee5c8a2ed2b03497660cc0acda063dde0477b32030be394634 SHA512 a2572be00e592686d30a114c862454b817b7494b90234fd77b154ca0b50117ac2788c2ecdd471a90d88710079137fe3e1ab8f2d02bde108223c30547718eab79 WHIRLPOOL d171135cddf71520ac583adc2cbee46d35ab730dcabdf3703bc1d657ef2eaabfbe7004930ad9e26f8b1e8bd94ecd9a9c9fa27410e5616dc33c35fb93164360bb
 DIST neon-0.30.0.tar.gz 909989 SHA256 2962cfcb5d30f3272e3d2fa0e473434419770a3801afe3d46e5d1650787990c2 SHA512 67f8a6c5549c37d984d8a0af88cd93c8c51593fa995662fd686e47acb630143d7b0c02c09d3c19f6a0181e0ff82940618cf72a76f9cb17bb964293f4118f013e WHIRLPOOL 75df16aae54410e97887ad1b1d45a17e58868cffff7d929f511c4840179ace1500c33228b02de7a038b9620d729e5153e1e14cc916ed1af9ce90bf4c49fb4b71
 DIST neon-0.30.1.tar.gz 911414 SHA256 00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd SHA512 4a9e45c886e04c5e1a1c781f7c2544b73724e09745097b1e8dc9adf9acd79af1762d668d4f18c295d7b4148d57af797834dd3c1203f2529089f7d1972ca71e63 WHIRLPOOL 747385544f0fbacc6c39fa5911ee5a21654ac21ecea89f297c17b43c21a7a649ae47b08b155733e9da0286a24024f4e54dcff3c9c2d678d9abe27f83054d718b
 EBUILD neon-0.30.0-r1.ebuild 3127 SHA256 abe4703a58e7c6a4e2a042fa6f92a6f1a504e3772d5f01aa0a3e8446240913d5 SHA512 a917c7e540533dd3a5dbbab37ce5f368ff3a65818d4263777a0da079ae5849f558730d0cc34465fca288e01ed41036f573551a0d21df6d4e4e786cfe80b60272 WHIRLPOOL e17c6a6799a42778229de758ff319fa9ae533fa1488e0674754c7f5960d4196f663a5a5c9077b2a13ec4cd061af6bb22ec7b13dff9683af0dfb1055811fbf139
 EBUILD neon-0.30.0.ebuild 2512 SHA256 01d130b08ce0a58ee47005cfb5dbd67cbc054eada8c28ec9d9eff97fb6c97e6d SHA512 cd792bd8b46e9556dc28b3ed2c6ca32f59f4aad5fbca4b0c8a34d5f4203c4ccecb022c3695f01244e3e2e3461d8d96388c188a5d95de1427b150d01b8d3e3eeb WHIRLPOOL 13cf80bfce43967170de73a19bf3a06af3ec78f21337259760e4010097f6d7294ddf1b2ff0054cf86db4b5b9a46ea1e6a534861315e3ec0a908f37d3b277a361
-EBUILD neon-0.30.1.ebuild 3031 SHA256 41ee78d3dc6ecf5b7baaef8b57ef52569ddd67c19f2c620733bfe5f417135b3e SHA512 5a0722e69168a2859baf5201db56c6e798cdc992206e06a69be66e60805f836daa9ee1d839477747f47ac4827b4f4b24c9f8b45904d3d57d8f32767755f60d44 WHIRLPOOL 19a1957c7abc36afe27e0c3dc5dd63a8bc1d80e778f85d6ba1bb15c828bf2c963839a8922fd949193f8db213689f0960c48ca2ad339a2d55119a9afa4fb446dd
-MISC ChangeLog 31689 SHA256 97c5441bb38dc0dcd438c880e2249d4b78809e5139901d9837e3043360f482de SHA512 18b8e60a7c6d348f4793783434e121bb36a498a46b82651bc298b0b5dc5252c2bf879cf2ee22b7fd6b79140b2230d37d38eecdc14b2588cd0207bb17f7de994d WHIRLPOOL 7467c52747e69c8410643eba2042fffc72699d46cdf047654e68d4404d2fdf64039794b5f2142589b7f6b6495a0c3067b4c2789a9fb0194e3542008cab57702e
+EBUILD neon-0.30.1.ebuild 3086 SHA256 e0c550a97a3c1551386a813a165330a78a75015680d9f8a974d30bdc6db9732e SHA512 ec946d19b3e6182c441f7e903f3a370f75542e83cc05260d0e54b5c755b314406f3c995cadfa5bd27c66300a1f025c2ec2f53602744f50cd7474ccc852b442fd WHIRLPOOL d0ed09a1a1207f5c515413490783e510a746643354b7906e04098e499d03c86f1c100681957ac18ae38da47507d40a7ba5ded46812ce967c612478f735b0682e
+MISC ChangeLog 31847 SHA256 ab3bbb573c3cd07b4c972b79709b122889ed035d627a6e708c625162d7b448e9 SHA512 cfd16b7395871ead63c2663d4b6720352793ae82b812a8a08c250130369d1a22eff9f89ad9bdfcfad712b21d5a4c1eb08dcb8d73591d77283b12971d413d0e3f WHIRLPOOL b1489af506ce49a70e0c9d37e4c5056600df59f5546c952157b8d5d5f161e1c8944113d883a6a08a857da32a4111de519b74f21fb09b7a21121ae252025c4e1a
 MISC metadata.xml 1221 SHA256 9c82ad6fe8e39c5dd55a026c64723e6e67c28b0332f8b4268b3043a0913b0b2c SHA512 fad08f7f145be6c765c130d276e653f2376c1fc78e4c2c51ccc6fd3b08b5694d3d03c82f69bab12e6a329b5a20ac8e261491675f0b44234181cdeb99d206166e WHIRLPOOL 223bc31e8bfc93882836a82d0f83ba8d59d75f61e73640515341daf05aa88d179f0e2c3988d621242f6dbaa6528d8d67f0e9c96f248e44f36df217f8d2df87c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUgzGkAAoJELp701BxlEWfBdsQAICacjzMyI4E/u0+THd9B9zS
-zvRWBQyNCfSCoUka0+gk2rSL8wiVWoHFVhKDlRtxIv6HZLuUvn02DJ70Xr8CRne7
-PORosw4IfqhnOmmcjWl7OdHK0byXOzU2XLH89sb5MNWNr2kB5EiSMthF32tSY6fB
-YRlJm5SYDpdVPEjcENZk5JkxAVL7avhXTvBl2oJuTl/ycFpaz4Qrg7Bo4gGTtyB8
-4yLaNRPSXb0BJlYwnID9PPtOJWaxkBit73CYO8ANXpz/VThennNwSnDxiD2puB+I
-1wOTR/mfVPZvoroV6rVyYz9aYtYxML/f8H+qAvrT9NYac7raAkhYB6UTIqPlOBbR
-Eay0eOsS7F6eiUuohs7rNXDtm/a1/K0LA9Ktg19LZAVqSN8ChoYuqGloo4GlX+Yv
-EWG9NO4sbn8xpJcFZ6FvcH0w1naZMuVGr5SjPi6811B/Je65aUm6BJ2LUm4qNdla
-3SScW6dreMTjgQ42y3dgPaZ2S4Bs6tbPnXZgiX0bPvUu4P+xaZE14VaDStYLQkGb
-99ScR+YmhTNXXgI6Db2j7HBsqqJiMwXD7o3DSLECOGBv5VE19iVHUGyLMAe0myvg
-gSei9gBF2VvwhI9kYdiOm+0yXUaJHuqAhBb1hI+z/wvhf4a6QLqz5AIeAmU2ZGLQ
-qmYqVrsZkZLzUVcr0Noq
-=7mqq
+iQIcBAEBCAAGBQJVVvhKAAoJEPGu1DbS6WIA3OMP/3JjsS/Cxz0l1wdWd8TbLJFt
+leno7IrhIhXbK5IBpMitIAhts7pnqW+5xZg6yDwTICjbReBiNgV1MgogfDt3G+9v
+s3p+lguFQZn9mDG5BE+dAnsNgDfsMD0GxbRiKKxkkbpAQeQGpxycDlIjh7GaDfY0
+x4KevAEyplkFKJr0WNpzdAjyxhpaUK2IMbj8kdftnbtzPVuuzwl4mMHhPK2aRp8z
+WnU5tqUCzOHcKq796m0uLiXa5iA2PapmzMdaNrphjU7VDvZHz3quZ7FIiRIuEZBJ
+ZJEzyJpzZzmWsIoUNDmGbA1PK9ISolC5xNm+m00DLAZ8sn+gLal9NFo2gkncWQ3v
+yYh2M04+/t8yhrOchHJcRBwK7KuxoJvSWaOdneVGRVmd+05wCcWmvEGtzKx1xOOI
+GuW79SwS+fX3W/CbBP1/tap2ngzTNsfE5aqQcYQ8bwcHSHOixZFQ0nnueXAP4nkz
+WI+Nea1h0HHkHIaPGTdJEMpqVFjRDpgLRQK6widHBFNHjHhv3LBigL9EEofPqWtb
+Vx/Av8xkXycB6Z0uYoQlo6LS6VzNWu6eKgSWTTk2+fXL7MDEH3a16eWMFVED9Six
+7pShmnLrGdokN+9SBjSYx1m4Qgh2qSWGVBs7Mm1i8DjbeAp2S2OtdlcDPgJGtqp2
+oaE+ytZinJFSD+SZdlkN
+=q8iz
 -----END PGP SIGNATURE-----
diff --git a/net-libs/neon/files/neon-0.30.1-xml2-config.patch b/net-libs/neon/files/neon-0.30.1-xml2-config.patch
new file mode 100644
index 000000000000..1290101844ca
--- /dev/null
+++ b/net-libs/neon/files/neon-0.30.1-xml2-config.patch
@@ -0,0 +1,15 @@
+locate the $CHOST prefixed version of xml2-config by default
+
+would be better to use pkg-config here, but this patch is minimally invasive
+
+--- a/macros/neon-xml-parser.m4
++++ b/macros/neon-xml-parser.m4
+@@ -44,7 +44,7 @@ AC_CHECK_HEADER(expat.h,
+ 
+ dnl Find libxml2: run $1 if found, else $2
+ AC_DEFUN([NE_XML_LIBXML2], [
+-AC_CHECK_PROG(XML2_CONFIG, xml2-config, xml2-config)
++AC_CHECK_TOOL(XML2_CONFIG, xml2-config, xml2-config)
+ if test -n "$XML2_CONFIG"; then
+     neon_xml_parser_message="libxml `$XML2_CONFIG --version`"
+     AC_DEFINE(HAVE_LIBXML, 1, [Define if you have libxml])
diff --git a/net-libs/neon/neon-0.30.1.ebuild b/net-libs/neon/neon-0.30.1.ebuild
index 51e43dd06699..7d255cb055fc 100644
--- a/net-libs/neon/neon-0.30.1.ebuild
+++ b/net-libs/neon/neon-0.30.1.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/net-libs/neon/neon-0.30.1.ebuild,v 1.10 2014/12/06 16:41:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/neon/neon-0.30.1.ebuild,v 1.11 2015/05/16 07:56:57 vapier Exp $
 
 EAPI="5"
 
@@ -53,8 +53,9 @@ src_prepare() {
 	for lingua in ${IUSE_LINGUAS}; do
 		use linguas_${lingua} && linguas+=" ${lingua}"
 	done
-	sed -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/" -i configure.ac
+	sed -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/" -i configure.ac || die
 
+	epatch "${FILESDIR}"/${P}-xml2-config.patch
 	AT_M4DIR="macros" eautoreconf
 
 	elibtoolize