Fix from upstream for building w/newer qemu #528386 by Reuben Martin.

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

3 files changed, 48 insertions, 10 deletions

diff --git a/app-emulation/libguestfs/ChangeLog b/app-emulation/libguestfs/ChangeLog
index 18a6c0fa35e4..bfa7a4c91dd9 100644
--- a/app-emulation/libguestfs/ChangeLog
+++ b/app-emulation/libguestfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/libguestfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.35 2014/05/01 19:23:28 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.36 2014/11/08 18:55:30 vapier Exp $
+
+  08 Nov 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/1.26/0020_all_qemu_configure.patch:
+  Fix from upstream for building w/newer qemu #528386 by Reuben Martin.
 
 *libguestfs-1.26.1 (01 May 2014)
 
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 6fdeea52929e..0e6a5c004b82 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -10,22 +10,29 @@ AUX 1.26/0000_bug_499150.patch 406 SHA256 3811f091d4189327719aca7ffab726452a995b
 AUX 1.26/0001_add_gentoo_names_to_configure.patch 262 SHA256 0d18682bc8666cb3e6aab79731925acfae5a636b8ad6bb75b3dc4d63fae27dec SHA512 9e6ef0c0475c5b180bc0ca7ded197901e25383e0359c429514e9c0217b7059d5f900a19d30d7d864a386279be0fd45bd9d41c56062b48c11dff31a8f92c5b789 WHIRLPOOL dcc96a8e752653ca9aaa5676266ffe20b69bf168bb955428807f0134cbfc2dd379e5250919da0e9a48dfbd84d62ceb98c1acc0025e794aa5ecfaec02945e9783
 AUX 1.26/0002_add_gentooway_to_remove_la_files.patch 555 SHA256 fc65ce8df2f910c1ac1c4466c8f529fc442b136914b9f50ce1b910834349ca59 SHA512 5dd8f7a8eeed6e2e4e842cd9fb5fde5104ab47bfddcbe218107e181c3891350eb425648667c4d70becb437bbf52506035b20778ea3a7954f020e4a2be76f959b WHIRLPOOL e776522e5a2e14c3dea2f35ac3de1f36763ec6eaa2c29e2d32a062c4df2946268d54bd6be5216caf861979dc442ac9b0c2ce8a6b765a09f53ea56258cb0b6ef2
 AUX 1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch 508 SHA256 10d75b8c50995ac7ec07f7f7d98c41f4871dcb7094873398c8d71dff3cf8a7d9 SHA512 9801326dfd2fd39202f8bd0765b954c3947e829d9568bda9a50c14388b9e7d6855c2fd38976fe98cd1183163d220b3795ec1105becb49a9de34459bb2ea74112 WHIRLPOOL 595699b9084be65847de0bd5969d0f50392cd53d830dad30eca0a9a9c8f336e680c068db59864d9efa67f91e00268ef91ba6b843f192056eb09c291b113be05b
+AUX 1.26/0020_all_qemu_configure.patch 764 SHA256 3efa60756c9b51316c0637a86ae02e4c2a22bca36cf040f40c20411c996e48cb SHA512 d7fdeba2de62e32847cbdcbaaf1bb4e031971572c822c530442697983c56d6150c61f1e116aff5d1864b4e5cf76567bd5d2de56a8b53e6359681a0c0cba2ac29 WHIRLPOOL 7906aea96cf76d5e428f7e0a42c86c382de4949292446cbb7f8f463e79f42d0fae66c552b8dcac3912335dec8494defcff5f1fc8103d497f19d986ad39ae0846
 AUX 1.26/0103_disable_php_bindings_makefile.patch 231 SHA256 f5b73f353746d7f945c8948e6b7bb2d192dd653a92124aefe578b49960179d1a SHA512 b359cd29ab9cb6edec5a4cab1d84b022ae6ff42c3adae75051ab0d8c87dda39fff17e02ada3a863177e3dd979dffd4958cbc3c71cdca89196c74f1ebd14a8da3 WHIRLPOOL 0e95d9b60744f4dae6c7599d899d57cbb9a8f656b3cbb5dc19667f679c472d749808932c8ec7826da26d3599f2d9f22b99410a2399048376e01ed9dde7284d5d
 AUX env.file 47 SHA256 265f18ec70d803a243b16303638ef6347212a93318da71bd9e15b6dc7dc2d11a SHA512 74b5c63ab4421238b4e2c54dfc9579dea719101c0b9066341ddf3aa64ff1ed739e6d38e837b388ded1f741bc57c47a52772bf22ee52318acc5cb34908f1df1fd WHIRLPOOL 6dc3bbd8ed439f4ad3e51f0a0ebffd9490d14dba7c32fd8c39d6e0c8bbf11af344cc4bd445ef9f74c085b5160e3c6e97715b507cd46bb2a80d0920475d1d7301
 DIST libguestfs-1.24.0.tar.gz 11017148 SHA256 72771e793a4de53d1214ed9d000d93dd6b9958384fb354b917e2d3283d79f363 SHA512 e19a257ba049d038e322f6a53866b448262e48841abe54b8bd36dd94af894b8d4ef61fede6b35e085d81c702b00526d2ef1388b0a4170c780d5d7da2e0ae5ea2 WHIRLPOOL e80329e0b13ee25f7e40c6ae0500f50c9de242a0ea39f3c5f5b202ed121324de35d7dcf90498bd53025f485e615a536cc07f4e3f01a945017af532f218ae82c2
 DIST libguestfs-1.26.1.tar.gz 11912359 SHA256 d047f951e79cc2f00b62a7e8d4e3acf18bb69c6be0a75884158923828b5264f6 SHA512 080a90d54b2063e2bf133c456a0624d63678cf7f80aa485dc5fd0c1d3577056c9fb894fd4fec67cbab29ac70f3b1c9ab070cf86ba5a09a8c8fc266f490c68809 WHIRLPOOL 54193361453d8d51da8070d0b4b5fe4e28fbf5e39aedbb3991c6f20876fed8a9f9c41218048dec697894d06d0edb29c887030edb38da899eb336278dd60ad974
 EBUILD libguestfs-1.24.0.ebuild 3694 SHA256 74e185484aadcf35c1ae1c4cb49dc52d2445800f964ce852d000e1b4c63d106f SHA512 7f13ce0a1a213259f5529b5696ca94f865f4c8dbfa46136f7c03865b630fdb5fc8c7e9c8917e2ac927cbefa7714a8a2011e509103431a74088e746ed8d285e2b WHIRLPOOL cfdd357faeda3e084df7edafa6ff63cb0ecfb2ee33da0dc1b267e9e9b5c21fa613d49bd1c9ab0725f840191d21eb628ec55dcbc24fa9309ebf44d362bd47fbb6
 EBUILD libguestfs-1.26.1.ebuild 3693 SHA256 767db9775c7aad080f606d5e65c05515fc65c4914899f27e3eb839122883b206 SHA512 42c197c555028923698d48878f4b93c06fd459e86fd2e610c8da4ca765b4ce0811496dd390f0157cd3b32834d862eb312a49def86432ce28502b289809dc650f WHIRLPOOL f06a969ef4d89068a8a757f9bd7ba5573e40b6f4bbae6d65467822bfcb3246c6852f386eef31361a6e789f6c4a8940f15b7253a74584cdf2838398114468f9ae
-MISC ChangeLog 18063 SHA256 5ffdcb5fbb2b697cc320c8fefcda6edada36416a0100a384b5d1ffcf58af17f5 SHA512 b21e9283041fa0252c4b81deadaf158f5bc5dcbf735c95cba49cd49d2f3fab1d2fd0d98dbbbeed54932ebf22d12070b8c85d699b6e4960e3c12e7532600bdebe WHIRLPOOL 4616054b798e14337bc1c4df035892c8c488d15d58a85da2194ea71ddee743c0ef2e4c5163788cb95508aafca919991e48b0f27b4d9d146b7ed4e8315dca3965
+MISC ChangeLog 18228 SHA256 91863583b0cc83e4490d98ce6b9eacccb8ed908e6097b04282ed4e8569b86314 SHA512 5aa992643e315efa31bb3efcff5123778643d0b9f3b999915de67633478180d8bc77d5e6087c48ce196ed345e5844407bc882b7fc4468f285d225bfbbf6e4b63 WHIRLPOOL d0f6e9440460f5d33d1cd6d11dfd811bdf5458d045923843b8de8b592bccb7bedff5646dca9c7f32e644bf2e90344e1bbedbdb5748c8abce193f3da5e55310c8
 MISC metadata.xml 1104 SHA256 608f76ad5aa195e6992e84c760b290d7a125d29c1b59c5531301da36e41e10af SHA512 17807bb807f9651bd2cb40c7f0b3d10329baff4f9026c973f4668fb2d2e046cb16a5c2f5d38cd6a1d3d2bd6b0e02cda1209aa484de90e914f127b63a0bd54c6d WHIRLPOOL f13ff36105bdd7a9093cc139e0eaa079f5693187c0306fb5e1b580341176291e04405c69dd4a7c4c6ceac8454f9356cb2537b7ce7518588d345ae8c35e39283e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTYp8oAAoJEAmJmMX429reS+sH/2tmcNv3mhFWm0ty3TGJe7Kw
-L1d1jHimYktmOkD6tirYASI1YqOO4mMkCcBLYH4LBpi0RjHhPCXR8WNv2lUadggy
-EhgWpdamCK379eRNeFzhDPbEnV9j61hghh8vll/K10prIRL2AQt/gHbZKMGUuvt9
-1jRygi341v0X+5BJmUjuQ7OHbY1F0jT4FWv+Nl/+P+wGj4YYcTTlksdurLjxbQz6
-CinyL/gCcMM++VT2WnHceCA5kvWZOSeAwQyaupzrfxIcWmZJLo9tXgRdmsOZcNMA
-7mL5M5NTienkTCvaNwwwhVX/keyOUbLp1Xz2zak+Lt5g+fILbNMtcH5LMSqkitE=
-=V+8w
+iQIcBAEBCAAGBQJUXmckAAoJEPGu1DbS6WIApAMP/jsQJiRp5Srpm3UFa9nTn0uY
+Ep5ujhuVsINczSsuWR4qxD6Mq2CKkkIzv4X054zJzyjzzUx1STGfDCEI7BcGGCA4
+xcTpX+q3EUVjwq/I9TSUtPf0yyojudvB5/rSCtqkz8UGc/7FMhrdGChutWavfdZp
+HRT2b5+9ckuTByou5fdMcnD//UGL5CEpG2WtAG+ILc2Sbc11vjWhczlBSL93oWxF
+6w1yv8SkKnVvyziRNrrYcH+kw7124OLGnyCJdikXshwF1SA+3ZbV8ozJGRd7tMsG
+JfnHmv474uleqoi3QXjNbth7VGDTZxH+FO3buTBSvl/e2NCgz51ZRbImmfYoquqe
+Ioz76iElE6RIBoHjxEwCA2mLoElFQN95InxoCPcCzymfsQ8mtjwj6zkCh33O8Gz3
+60hZwkgMyRMWrkvx/9xfdFyWsGTrD+GZTfz8YQhClTMRs+fll6iKfb0SI4sEFdkO
+VGew64X2y8MSylnfHKthIZ7gBH3v29QiEde9m6tw/mH9OI5nlpJLQYq/u1tsd3g+
+gcFkY0gQolt/+K53fyJVAWKw44X0aFfNsgphq19n+duWQ3qBBjcGcCbZuBbT5qQ8
+lF0FD/8GXuRJ3RLoM5uzrRu1Utb8GpWPVT6nsR+bCsHHL/DIOpgGdb8c+dUT8rAj
++RylSdmoxqGl1z47jIIi
+=QGW7
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libguestfs/files/1.26/0020_all_qemu_configure.patch b/app-emulation/libguestfs/files/1.26/0020_all_qemu_configure.patch
new file mode 100644
index 000000000000..77423f73e8c9
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.26/0020_all_qemu_configure.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/528386
+
+From 101d728e80cce73b882aac7af457013491d03311 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 22 Apr 2014 22:21:57 -0400
+Subject: [PATCH] configure: Make sure grep matches qemu 2.x version string.
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 34e4ddb..bb1a361 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -777,7 +777,7 @@ working.
+         fi
+ 
+         AC_MSG_CHECKING([for $QEMU version >= 1])
+-        if $QEMU -version | grep -sq 'version @<:@1-@:>@'; then
++        if $QEMU -version | grep -sq 'version @<:@1-9@:>@'; then
+             AC_MSG_RESULT([yes])
+         else
+             AC_MSG_RESULT([no])
+-- 
+2.1.3
+