Add upstream patch to fix USE=-numa #518568

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64

4 files changed, 35 insertions, 26 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 4d25213323e4..a71eebdf9dbc 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.366 2014/07/31 17:06:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.367 2014/08/06 03:22:22 patrick Exp $
+
+  06 Aug 2014; Patrick Lauer <patrick@gentoo.org>
+  +files/libvirt-1.2.6-numa.patch, libvirt-1.2.6.ebuild:
+  Add upstream patch to fix USE=-numa #518568
 
   31 Jul 2014; Michał Górny <mgorny@gentoo.org> libvirt-1.2.3.ebuild,
   libvirt-1.2.5.ebuild, libvirt-1.2.6.ebuild, libvirt-9999.ebuild:
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index e99f63ccf501..b6a063b83623 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX libvirt-1.2.6-numa.patch 686 SHA256 44ce5b439bc246ea8f19ad8a391493141205217028daded83f321849b5e2e977 SHA512 7785e2f5a991716e99444887f1f873f0bdd88f8b47cfb9230736009ab0a92b7c8a768fc535076e02885e71f3d5bd059a4534c6868a436ca9571da7867ee98b0e WHIRLPOOL ae924454ffad7ca2746a4f3e658d0d824befedf18ac78cca432eab22a8b72daceee500447ef24b1e86cd9db61a42e8863ddaa4d4a6e4f99acc638da55689ef6a
 AUX libvirtd.confd-r4 2015 SHA256 c2ca5d9a2d4ed433e91bd215c2ca678109cc981072897a497955e36760dc3b9f SHA512 b3e1d2433be7838a35386747422a8f98f2a7f6a92a03089f9472eb8ee2efb7d10d2becd363fea7cdaf8771da31b58cd60d192b25e089b6257ad5341b1074e540 WHIRLPOOL 284e72e704b759433d5ddc1a3e4019164dda6b48cb2734ea9a6780747938bba2855a99dcf1b125ab3f500a6145315cafa4a3531ff6938c0c62e5b1a6f99ea9b3
 AUX libvirtd.init-r13 3678 SHA256 5744e7392b0777d14142552237f517ff1fbf6c4734aff96fa340158ceed09e35 SHA512 d50898c07291aefc0025aa51e7f4356c1e5d7b22c3d6d4c31f6da3dc4b23d88e2678568c4f2c755c6763ddce9bfc0e2aedeba52f001daba9ff3cbba2cd57ebf3 WHIRLPOOL 6a8a39b39b7e9d6efca47800e886cbb1e88b9e948c3ac623d120780d34f1fd8bba48c83e445fd0c0bdbff67926fcc577640eb4db0137fb5d703abc6eaf790dfb
 AUX virtlockd.init 437 SHA256 0894a839f85dff6f97bde514437935f4c1589ba4f2cbd3e0efe28753698694a1 SHA512 3d7b366736fb98acd26577e29a3c00592e7be038634fc3b51891f557426cd9945bf08a4486f1d62aa91ce7dc7d6bf96d7e57ef06a3a0b4aceb55b9e9c9e9b2da WHIRLPOOL d633a1a7358dbf7bd94d70f44753c9c346adfc78537643e5f379cea017d20e1097998ecfaf87e47e4e0f9216d43a3053af24e3129ecfb8f110f5283a769f368f
@@ -11,26 +9,7 @@ DIST libvirt-1.2.6.tar.gz 29346718 SHA256 38a224559a1d04e5d4163c5c1b810df1f29804
 EBUILD libvirt-1.1.3.4.ebuild 12247 SHA256 5e21dcf8f227d56f3a50580ab199d1bb7c1727d6f73bc72ab891151c3fdf27fe SHA512 1f2d3606fa279d22264e4c37102f79539e5fe48568749501504df6d66009578001df436d5d23df37cf5df28fcbbbd9e97b9531ba547adc5e1f98a23d1173c273 WHIRLPOOL 64035eeacb9d8e9bdfae0f5baa9332bc4e970225156162c7852dec22a615ca2605ea8f77ffec4491b98b3be47fdd9549139d32d8064a421a43d84c605fc45038
 EBUILD libvirt-1.2.3.ebuild 12344 SHA256 ea672a111da390ea87f463195d6f2b0a1dfa514f4595f531e712ffb96fe2e217 SHA512 046787417e0742272dd3a9c55ac420645ae0e6675e3e24137de43c224a20cb689b3235c6eb3b420a43fa162104070ff117343a37b15cb0f0aa67d14d275b719f WHIRLPOOL 456a3fe6243ff57f066e70054bc6be5daab8c336991966a5e5b28cde26bd4a3a25c78bb43af240e58d71803e73bfd368f400198eb09fab7d40252da13cbc8c6e
 EBUILD libvirt-1.2.5.ebuild 12529 SHA256 e1c740b317775f83f5bd43b953ef39ab5ab5d4ffa44fbd5ddeffb26b7d0eee6b SHA512 07bc365b7afec231c0505b45908f506fb8209e8167522ad15a6d706685e86f2716f94863a28ec471a586078bbdba1028399da7265dd2934c3ae7bcab364c74d8 WHIRLPOOL d55e84e3767987b842d143f7b7632a265e55ad5d9064cb5fe6d815d88e59de8cf61850f03948c5a5594471372379271e6e29d1e4d0ecace34bc7a7882e3e8577
-EBUILD libvirt-1.2.6.ebuild 12529 SHA256 9b4b490412729f6ac3d734e5d0cb02f57fc2fde7d1e3218a9004091884175835 SHA512 d47e16156c48a0d897b4668279bc642bdc36d5a23aa4dbb5ad53aa3b3b07febfe3d9ae7a74eb0957a02254140fc423e9ce509a2472bfd206e569ff8745654115 WHIRLPOOL 4baa247a0dcc5ee38bf75ebfe8ec37dc821300e613aafd377062184ef432777addfa4b92029e10bfb1a447b8847246baceb5171767004c19eb2997f86c0f3486
+EBUILD libvirt-1.2.6.ebuild 12569 SHA256 d79ba094e1f4bbfeab9b5de614710c9d6639d57a1200aa470571454b8f1e1b06 SHA512 7d0af05c3e2a2a9e162633b246f2e1f01fdf73273b401d032cc2bd669ab20433632af64011b8426189ad38cc589b4a6b3e48d9d0f877d85ae6ee49c7e9574631 WHIRLPOOL 261de1c52541c947c464b783eed8fd1cf5dc9139cae8c3ea9abffe8f1b3a85bf694da30b2d9b86e570f0654b2d30bccb1e2eee12fbec0d9d7ab677fa9ad3cedf
 EBUILD libvirt-9999.ebuild 12525 SHA256 a659d7c403dc8e4b17150c5a8410763b8f20f8b61624f6ad213df6543f9f51f4 SHA512 a37fec113402b3b293fd139979bc3c85225c255fec448f0bac4f262b4a2a1ea51593edce13d6d4c1770387db3ac6e1f209769a6c581805d71fa3e4cb7d485643 WHIRLPOOL eb104977f08628d180a45430b75beffbb616f40bbdf9499b1de3d96b7ff8ffd6736375797042cdf000cc16dd2d4602f514a42f1ad7200058c94193d5d627ee7d
-MISC ChangeLog 18539 SHA256 3e3a217a86f9b2c3c77ec1aa126fbec7c9258ac1fd32da815d6bba56e7505bc6 SHA512 a7e0e70df436b386fcaad1aa551f41fe2f8e78c3c6420cb9b2de2d478e38e12794268f0402f70e829ea5c0ee7939df1224c12834017baa22d15a223e008abf66 WHIRLPOOL 9f8c2dffb0d92c8a9a06f1757138287b818cbba1e4fc8f7b0504b616f16b5073065f8c022b2e448dafd652b057f0b9b1c1e033c552183828cff231fb514deeb3
+MISC ChangeLog 18694 SHA256 218c953bb4cd4845df946cc367e61e3b4bb119f1b9a3c4906c09b7ce39a9f87b SHA512 aaf333f1ad160b29233d527e0db2f7b8832dd1bf965ef7c4fa1366f5b578766bbbe9a043047df38f68b4bf2f3cb5e19e86059a4268a059b892239a926c01712b WHIRLPOOL a902bbb9b33dfd8066f6b630b2d297359c0d9bf2087abb847238d80604255d70cf33e4d37db12fb41788a5d11542740cedbee4143ea10759a7a1308b5effc016
 MISC metadata.xml 3447 SHA256 39904bed8984cae6dcd825a88a5c28e2692d47fd13da73f5041b58e254e3b350 SHA512 d0972e6eeb32de75ca14c183873e59f87948f621d873cfeac3e930b63775fd2b8b776fdc482b9dc8c4bc2ee24ee45a52e35cdbf8adec30881ddbd745f249a312 WHIRLPOOL 2591d99b26d2ce784112a862b8362ef2a738a557bb2f712558216cf25b6680ec77dca9f5ec5696f4a949139a6de4e7e9ce8c0bad1690282ca169c28d218e5b6a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJT2nelXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOB70QANmBP+qTJ43TfsN6DlHdxOqZ
-UHNPPauM4VQNLmY3bfLnFa1lYL4v3Z18bHJH5/8LzUIoviVgpdM3PJIoZUPLreUc
-brUkXUSt3ZUl/MT64EyJumZsONNoDZzmK7LFMOuNA8T0pmFECzgWcekZXghC+Wir
-8Ig21MtxZD2fA5YIXv+V7kuQPqM0ptyTJONDZ3onHVYGPFUjcqMB6adcfSUgcUm+
-LB6p2i7/f2vYprJBQQEuZsH0iemrh2eUmf/v0QTszmTSVlBNaAIxZvTdRbs2rczT
-eEt10l0Wv8inCIt/GjsQp/bHWmAo+OHI54Gn/91NaHFpR3sShJ2mJZWOfrmIy91r
-PNPqQRfTRxBjIQDqn9C2kPokPAmCEB2XD/nRCliZrc6fPXdcoi4nIdOolHNVDCOc
-2WBnp70xtRtFYLQu2WDCDI/pPC3910LjxGovFrUr7OdDrEQtM0EEkn/GLgFYu4pe
-wPeeL7tL6jfTjsBggiJkGykDlR9fZLlE1DynFEMqXSQ+FjlFKi7SA5UBvBtZFT+K
-3nV9EZreAP+rhxFKsNPhbr89QAf54Z1xRdNIbH7DsK4PFXJBvauqCQpcxP/KSUvY
-3ZicJEjuR0Ij9ML+z4GO78cRmbaciZu7XYlSc4L7LqQm1aUwia0MneAGVpxckIAt
-48rOzNXS/jLD93UMXMs6
-=DzVv
------END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/files/libvirt-1.2.6-numa.patch b/app-emulation/libvirt/files/libvirt-1.2.6-numa.patch
new file mode 100644
index 000000000000..5102d6aad9dc
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-1.2.6-numa.patch
@@ -0,0 +1,24 @@
+From https://www.redhat.com/archives/libvir-list/2014-July/msg01076.html
+
+diff --git a/src/util/virnuma.c b/src/util/virnuma.c
+index 46f48d2..7a11a3b 100644
+--- a/src/util/virnuma.c
++++ b/src/util/virnuma.c
+@@ -390,7 +390,7 @@ virNumaGetMaxCPUs(void)
+ }
+
+
+-#ifdef HAVE_NUMA_BITMASK_ISBITSET
++#if WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET
+ /**
+  * virNumaNodeIsAvailable:
+  * @node: node to check
+@@ -485,7 +485,7 @@ virNumaGetDistances(int node ATTRIBUTE_UNUSED,
+ {
+     *distances = NULL;
+     *ndistances = 0;
+-    VIR_DEBUG("NUMA distance information isn't availble on this host");
++    VIR_DEBUG("NUMA distance information isn't available on this host");
+     return 0;
+ }
+ #endif
diff --git a/app-emulation/libvirt/libvirt-1.2.6.ebuild b/app-emulation/libvirt/libvirt-1.2.6.ebuild
index 62e43add4329..b40f05fcf416 100644
--- a/app-emulation/libvirt/libvirt-1.2.6.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.6.ebuild,v 1.2 2014/07/31 17:06:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.6.ebuild,v 1.3 2014/08/06 03:22:22 patrick Exp $
 
 EAPI=5
 
@@ -240,6 +240,8 @@ src_prepare() {
 	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
 	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
 	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
+
+	epatch "${FILESDIR}/${P}-numa.patch"
 }
 
 src_configure() {