The 1.0.2 release had broken python bindings.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

4 files changed, 54 insertions, 4 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 58f502c29f1f..5e31b8650bc7 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.245 2013/01/30 20:11:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.246 2013/01/31 16:03:54 cardoe Exp $
+
+*libvirt-1.0.2-r1 (31 Jan 2013)
+
+  31 Jan 2013; Doug Goldstein <cardoe@gentoo.org>
+  +files/0001-complete-virterror-virerror-name-change.patch,
+  -libvirt-1.0.2.ebuild, +libvirt-1.0.2-r1.ebuild:
+  The 1.0.2 release had broken python bindings.
 
 *libvirt-1.0.2 (30 Jan 2013)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 8d2f74c2b83a..142ec3cba730 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,3 +1,4 @@
+AUX 0001-complete-virterror-virerror-name-change.patch 1730 SHA256 10f6b00afe0c0cf6ec5baf70029e372a8024fd267b19b04dfd47a25402c866d0 SHA512 956e862d8a285d08209b2f70e6356f02f7c76b7e319a22f66fda7fbaeb4bcae1c04d94615fee67728493a00c90993de838c0d349d25a26ff480649521ae28e56 WHIRLPOOL c61747b4ad57e12f3bb52d2b40ec35a88bb00fa095ce35dc48aa641442c5c76986cb38380309d7c2f2b13fbaa4284485f1385946786ea52f4cb777155d081659
 AUX libvirtd.confd-r4 2015 SHA256 c2ca5d9a2d4ed433e91bd215c2ca678109cc981072897a497955e36760dc3b9f SHA512 b3e1d2433be7838a35386747422a8f98f2a7f6a92a03089f9472eb8ee2efb7d10d2becd363fea7cdaf8771da31b58cd60d192b25e089b6257ad5341b1074e540 WHIRLPOOL 284e72e704b759433d5ddc1a3e4019164dda6b48cb2734ea9a6780747938bba2855a99dcf1b125ab3f500a6145315cafa4a3531ff6938c0c62e5b1a6f99ea9b3
 AUX libvirtd.init-r10 3636 SHA256 8912375fc1d5e031b207074e4675f4d54a8684ba261b89cfff5491f430982641 SHA512 0a23c30e5766d32fd9d3f51053ad4a3c981b7b62281ddb2a9afc59f78ade0a1521504ad01f4cc233a66afcbd94c91b7ca341b9747e4a7bc13d61e0be235efa84 WHIRLPOOL de6cfb3637e0114978bb3492d03f2b3cd487723863cfbe086d4c3c2c2bd875f8e242338c31e610094f74867db84439c07dfad508184c798839fd0d0989a56fc1
 AUX libvirtd.init-r11 3656 SHA256 51c3b79c1a71638211056f11085936d40874c5eb1440512309a5c0837f5a59e1 SHA512 c1743271fcf18eef38d9202ca58c7d052159262cb75283ce13739f6a21f3c6024cac567f52f082744c8f4321b857ace4489cc363281a7757920dc306b618d27f WHIRLPOOL 827f3908c5580e526ba83efd005c72d5024ed04072aab00e372347315d9cb6be88512c9148b5283d01190c2ef2ffa4fec477c28299afe70414c76188258103b2
@@ -10,7 +11,7 @@ EBUILD libvirt-0.10.2.1.ebuild 11493 SHA256 8b16eb20d78026ffa2feccea853650da6747
 EBUILD libvirt-0.10.2.2.ebuild 11622 SHA256 82e89a1ad116af8ad4818e32108f36a739b52b97be5df6f996a26c73aa8b5ea0 SHA512 a2484b229926316ab9735efb8bd6835ed15e773f87c7a25ea387f83ed14812e66f4498faca6989801684f40a01e3f7a53382c953827ca0105ae815ea42b8c189 WHIRLPOOL 51c1ec1d51d3c950ef01b7af02b4808e0c87fe2413eeeef9dc9be189acd771b384a0c60fd0d2a72eeed7709af71a7d1565dd77ba66bef0d87b79e1fa98554779
 EBUILD libvirt-1.0.0.ebuild 11574 SHA256 1277354f747515fda62740224ff1d8dd967640d0ad3a3231aa292f8c42dc6e29 SHA512 2c55fe9f0dc27765aed9989ff624d3dd3b31d5d015eb666b53b5c9f8f156c9bd4aa904a0f2a1bc22771aab01d46c2ea56d066adcb6d2add9f18486f0b1bb75bf WHIRLPOOL 73e0d6892b78766ae5e744af6b822fc64e37fe3f4737b495e766f08902c9b26d6f6b833be49397a8aa4f26d37e02de62af3f7365f88ecc39eb3b93d5a5cb2d3c
 EBUILD libvirt-1.0.1.ebuild 11798 SHA256 76427bfbe624c6491384d431a254a93fd63403856d1436a03899b9a7223c9c9b SHA512 6d01eaaec0f29c3f00218ca3062f815ccb186cbbd02e123106c7dc35fe88c0bf823a6392915c0309645f43fc384b158e93fd634eeabd1db1131a2bc23405c72e WHIRLPOOL 8d7285f4638a01d397060d076c70bcd273573f9daa6d606726004094dd6139f4bcecabb1c7ac73f5848cd8403ef3b9d1b272a16ea10b72167623602f7a01d32d
-EBUILD libvirt-1.0.2.ebuild 11798 SHA256 1d75d56f5eecb69f921c8c6accf5b50043c19e5174bff821b6d7fe5446101f11 SHA512 dffa44dccd777bf4143db650d7998861950f0313d33c01222074180ffbd1283ed129fad75afa85f9427518343fab9db8c50b5cfcf9439c27290b056854579489 WHIRLPOOL a57461f769784f3a610a4f0a4bb55f4e3b760da5d9cad6d6d0419ef4ca9fd969327df9285e08d71221db685ab0cc1d257248dacb208fd80759afabe4fd7bf068
+EBUILD libvirt-1.0.2-r1.ebuild 11875 SHA256 d67219fb7565a67ee593b69a97a8916a1b4bcc99a58cd262d31ae702357db73d SHA512 f0461358076dfd6d350d3f7b23bbb92cc845518c4a0f0685d44233907e784b01f97b9de20c2380340f8b7df6abbbf50c93bdf79d8f9cf92ee636efbb7e2fd6f9 WHIRLPOOL 68c44511b6065960c189b7d58ca6a4e37d05d83e41238d05f5252552d71c040f3c2f00bae8018c60fa6124ffe6708375abdb26909d31a69260a6d93d017b0d43
 EBUILD libvirt-9999.ebuild 11519 SHA256 97c4435c5719e3e94658fe3c66366afc37f1bdaffe6221183635212a5061837f SHA512 a152f25c2aa41db942f0d51dd65ae4412b31ae077b3e7ca48dbe721d2792df8fc6dead7bd03fccf2c7e95821b9bb4e167877343b549a4a6949af97fdf9a9b099 WHIRLPOOL 4ecef7a049e9610e7ce891eaa31dbbe41bffaaa08686d9bca23fd5b8770c8690c338a4a78fb64536a295b9cf1f43d379bba2891e391b935519d4f4b269c69d04
-MISC ChangeLog 47048 SHA256 c17db188dd5601d5a71e14afd55594d07365f66520c386a00cc97777ebf40b88 SHA512 4bf205de32cce52d99e7d578ee2ad947c439cff43484296b34e550e8af18e7af18585ede5d3672fc32135bd4750e32b38f18eda6887a20185e95b381c77f24e6 WHIRLPOOL 1cfab326b89fd77ad5d02e56b8e2b9a6cd47c29b6d993583cb11202f1013a722c61f23b3146b1619dd125f1bb3b42480d2d74539f5b96b744dfdc805bc81eead
+MISC ChangeLog 47292 SHA256 16c1202ca7c6b29f4153632f856544a3a82c533627d9a528da8971c53179e8eb SHA512 5d67630adfe9a5237abf59b6287921c3e06fda2bfa70d53f82bc161200523eed393a904aa9560071f7ad5db937401076961be9de4564444ddc2b0904ef841bdf WHIRLPOOL e7962c96e6099a7d050ba55bc544bb52cf53658af022e9e2521fc926e45d4f0065c9fb50a475697f358ef895f9358b671dde45ecdd30a0b92109db9e693420f5
 MISC metadata.xml 3433 SHA256 1f1ed0c0f3ff9c388bf84c6877e7f5a9f2913b3d9b4ce71e3f98c64dde4a6084 SHA512 59c1c7df543b79e0de45dd0d30f0c2440a27baf2bf89fb8f4505c8d98ed152bb074cdf136fdb4299247f80099af5a3a2c058c3aa5ce277014128cd7f759a5b4a WHIRLPOOL 76a3e08490084f62049793359c23305565facaea07433227f432cbfdbd7e4a3956ca31a958c5b7634196345e236a5cb9000ff89bc7a22eaa9c98921990119d05
diff --git a/app-emulation/libvirt/files/0001-complete-virterror-virerror-name-change.patch b/app-emulation/libvirt/files/0001-complete-virterror-virerror-name-change.patch
new file mode 100644
index 000000000000..54f5e960444f
--- /dev/null
+++ b/app-emulation/libvirt/files/0001-complete-virterror-virerror-name-change.patch
@@ -0,0 +1,40 @@
+From a6b8bae5a6a4752926eba409202ec061d81c6c8a Mon Sep 17 00:00:00 2001
+From: Serge Hallyn <serge.hallyn@canonical.com>
+Date: Wed, 30 Jan 2013 21:05:45 -0600
+Subject: [PATCH] complete virterror->virerror name change
+
+Without these two string changes in generator.py, the
+virGetLastError wrapper does not get created in
+/usr/share/pyshared/libvirt.py.  Noticed when running
+tests with virt-install.
+
+Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
+---
+ python/generator.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/python/generator.py b/python/generator.py
+index 5d27f66..71ca883 100755
+--- a/python/generator.py
++++ b/python/generator.py
+@@ -123,7 +123,7 @@ class docParser(xml.sax.handler.ContentHandler):
+                     self.function_return_field = attrs['field']
+         elif tag == 'enum':
+             if (attrs['file'] == "libvirt" or
+-                attrs['file'] == "virterror"):
++                attrs['file'] == "virerror"):
+                 enum(attrs['type'],attrs['name'],attrs['value'])
+             elif attrs['file'] == "libvirt-lxc":
+                 lxc_enum(attrs['type'],attrs['name'],attrs['value'])
+@@ -137,7 +137,7 @@ class docParser(xml.sax.handler.ContentHandler):
+             if self.function != None:
+                 if (self.function_module == "libvirt" or
+                     self.function_module == "virevent" or
+-                    self.function_module == "virterror"):
++                    self.function_module == "virerror"):
+                     function(self.function, self.function_descr,
+                              self.function_return, self.function_args,
+                              self.function_file, self.function_module,
+-- 
+1.7.12.4
+
diff --git a/app-emulation/libvirt/libvirt-1.0.2.ebuild b/app-emulation/libvirt/libvirt-1.0.2-r1.ebuild
index a605cdc64b40..5a14759cb9a2 100644
--- a/app-emulation/libvirt/libvirt-1.0.2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.2.ebuild,v 1.1 2013/01/30 20:11:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.2-r1.ebuild,v 1.1 2013/01/31 16:03:54 cardoe Exp $
 
 EAPI=4
 
@@ -190,6 +190,8 @@ src_prepare() {
 		) >.git-module-status
 	fi
 
+	epatch "${FILESDIR}"/0001-complete-virterror-virerror-name-change.patch
+
 	epatch_user
 
 	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf