Fix for improving Python-related code (bug #311207). Proxying for idella4

Package-Manager: portage-2.2.0_alpha46/cvs/Linux i686

3 files changed, 23 insertions, 22 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 9390baea3c2e..eb2023d0bfb6 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.106 2011/11/10 12:06:07 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.107 2011/11/11 17:00:26 neurogeek Exp $
+
+  11 Nov 2011; Jesus Rivero <neurogeek@gentoo.org> xen-tools-4.1.2.ebuild:
+  Fix for improving Python-related code (bug #311207). Proxying for idella4
 
   10 Nov 2011; Alexey Shvetsov <alexxy@gentoo.org>
   files/xen-tools-4.1.2-pyxml.patch:
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 46ebc51f2152..96403228f732 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ipxe-nopie.patch 952 RMD160 243c65b1e9e27fde14b10c5f605cce635de88032 SHA1 06870bb3bb063aabe16e721f487f0756a5889e8f SHA256 22d1e84568e4bdf204404c45cd4d323a78a1b5a5a29cc4a0707894e22f40bd48
 AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19
@@ -35,24 +35,14 @@ EBUILD xen-tools-3.4.2-r3.ebuild 7049 RMD160 05ffd0fdba6761df2d59f3bd7421599e1f2
 EBUILD xen-tools-3.4.2-r5.ebuild 7383 RMD160 b31318f590f2d563c036a7acffe65cecc9bf677f SHA1 34312c51b92c28dc7d7ab718c1b5f67b1554be61 SHA256 0ae0c406503dbc8342d5a4abc72d896ec0205317c9e6ec8690f71a40bd7bb8c4
 EBUILD xen-tools-4.1.1-r5.ebuild 10316 RMD160 92450a0dba081cda3e23e94072953b858538d31e SHA1 f1af2fba3958c0813b37adc16c82d69d720f2458 SHA256 80485abdbcaf256d21289f0cf260de671d72bbcc023bf49df3bd99db99b23720
 EBUILD xen-tools-4.1.1-r6.ebuild 10651 RMD160 993111049c34acbbf59857b3794e68319a50e301 SHA1 4af2c578e12f6f9b29490dc04488a956d526af4c SHA256 4147a0918b80cda6c22cfe4219c4767a5b2a50b65790852de9f33ce0c16122fd
-EBUILD xen-tools-4.1.2.ebuild 10815 RMD160 5daa042810bd3a639cde7bd3adf81279a9adb802 SHA1 e7d97ae1a1a7187bacc86764568c44df70a4b60e SHA256 0822c802e370685414c4642dfbe12f28f82f42e184e5113b7d368fd5db073a3b
+EBUILD xen-tools-4.1.2.ebuild 10940 RMD160 e2aeded3fc58b58c9260e87eb1c78d75461bd324 SHA1 a11b4a6fa1cc6cd64ac48beae22552ed5f1d4406 SHA256 81533e276db9d1f55cca7a8d203bb51c1182e6a48ff61683159db6a67525d3b5
 EBUILD xen-tools-9999.ebuild 9517 RMD160 a1fa4abc0c2a8cf160d05fd699f3b2ded872f113 SHA1 ae51b976fe1f07152444e0f1b01e8e513e8ce215 SHA256 bd832962adbf6388ed7d44530587596f97543a6596bc59b5593bff7c972bc926
-MISC ChangeLog 26087 RMD160 0ee4a0c3129d992615aaec7912489d5c749f1f6a SHA1 12032b9007d9edde819c51e454c832ec6c18e6fa SHA256 69d41670a8144082c96ad6a62800763c2961dffdcff9009f3daf98c02a5dd25d
+MISC ChangeLog 26242 RMD160 e006264d1fcd3cf903b9e0d83919a14dfc9c0f26 SHA1 1583998bd517aa57d030a67012763654a155cb06 SHA256 d05c45f460638f1ebf18e9f4ecc777c13b4929da07fa902c355522157380b3a9
 MISC metadata.xml 947 RMD160 96890462f83ee4a47c9c77993ba76ef82a732af5 SHA1 7ff424eead47cb6ce81930c10d3b22b0d8f73d61 SHA256 74f0e5bea356989a42fd4086d87271ed7c25331306acb333707476f53cac4d60
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOu75oAAoJEOf+E+/4L5LmWVsP/3RKFmOy6eD4muXiqoUItTw5
-MGJOp0Gcau0aQU4EittWc4liZFMTSTxVu8pkgO+amAUin9u1FBUm+nv9MBCB0VTf
-IGTd8SPZfy3RJsE9a1kTRvyfW9ECvPYAfy8q2kc5rE4KKHkJLJqwcz2rm+SU5wjr
-diryC2oHWI21yE1fBX7Oml39g/4aHLTAzPv4w6J7dmJThYRoyq2T3E8ZjpQPYwNK
-MYMZfz7IA6Ok7L/N06iA15KbsaBErzqhF5VALk2AROXpwjfqKmZoGvlcPOwG1lPe
-JdZWvwVs6kVBk3+CaJv6pEE/I6Ni+NTetnkT1Eo6EuX53gbDXXjs71Vrbh25beqR
-sjxH1nfEbxpUdUqQ8NSlaaqpA4BhKTCtQUaGu52gqsyewhuBb2sHlc/r5xsCMWal
-KrCkEaR0XvqPOkcH97jVOrqj6BBHymdFkLP7jcrame9ai0goR/Hqjqzful4gp+N5
-dBXeYP6XJsePvDYBVIU0UQwuoMtVAy5HhnH64K9Gi3VDxO6a8mah0yNzHFBKlD1e
-rxi9GaYmTReLSiQOuY8jjcX9MgmlO6tRL+BWLkhuKm+2sX3Yn3oXCRfKUDOsMMey
-Q4Lpik0zPgXMnXrCaWsYBC5jSuPfaTZbFHrsBMGnC+UUW7xNeLgTfBnZgVsXgtD2
-xAfXiqHUP1BM8GtBfDT3
-=aISy
+iEYEARECAAYFAk69VLMACgkQdIssYB9vBoMqYgCfcfJV2kfD6lsFMuETk7B7Igp0
+QIcAn2PkRlnJQCSYfFOv9YvaOYX3p/6E
+=Grd6
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/xen-tools-4.1.2.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2.ebuild
index 6f2ac7ac0beb..573ce54560ee 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.2.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2.ebuild,v 1.2 2011/11/07 17:31:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2.ebuild,v 1.3 2011/11/11 17:00:26 neurogeek Exp $
 
 EAPI="3"
 
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="xml"
+
 if [[ $PV == *9999 ]]; then
 	KEYWORDS=""
 	REPO="xen-unstable.hg"
@@ -27,10 +30,10 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen xend"
 
-CDEPEND="dev-lang/python
-	<dev-libs/yajl-2
+CDEPEND="<dev-libs/yajl-2
 	dev-python/lxml
 	dev-python/pypam
+	dev-python/pyxml
 	sys-libs/zlib
 	hvm? ( media-libs/libsdl
 		sys-power/iasl )
@@ -77,6 +80,9 @@ QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
 RESTRICT="test"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
 	export "CONFIG_LOMOUNT=y"
 
 	if use qemu; then
@@ -195,7 +201,7 @@ src_prepare() {
 	# Fix bridge by idella4, bug #362575
 	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
 
-        # Remove check_curl, new fix to Bug #386487
+	# Remove check_curl, new fix to Bug #386487
 	epatch "${FILESDIR}/xen-tools-4.1.1-curl.patch" || die
 	sed -i -e 's|has_or_fail curl-config|has_or_fail curl-config\nset -ux|' \
 		tools/check/check_curl
@@ -239,6 +245,8 @@ src_install() {
 	make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools  \
 		|| die "install failed"
 
+	python_convert_shebangs -r 2 "${ED}"
+
 	# Remove RedHat-specific stuff
 	rm -r "${D}"/etc/init.d/xen* "${D}"/etc/default || die