diff options
| author |   Jesus Rivero <neurogeek@gentoo.org> | 2011-11-11 17:00:26 +0000 |
|---|---|---|
| committer | Jesus Rivero <neurogeek@gentoo.org> | 2011-11-11 17:00:26 +0000 |
| commit | e95f80c0e966fdbc1991ec48012ae1fcb3fee02e (patch) | |
| tree | f67140b749c94846d3b7194191d2fe55969a0c22 /app-emulation/xen-tools | |
| parent | Fixed to work with kernel 2.6.39, bug #389077. (diff) | |
| download | gentoo-2-e95f80c0e966fdbc1991ec48012ae1fcb3fee02e.tar.gz gentoo-2-e95f80c0e966fdbc1991ec48012ae1fcb3fee02e.tar.bz2 gentoo-2-e95f80c0e966fdbc1991ec48012ae1fcb3fee02e.zip | |
Fix for improving Python-related code (bug #311207). Proxying for idella4
(Portage version: 2.2.0_alpha46/cvs/Linux i686)
Diffstat (limited to 'app-emulation/xen-tools')
| -rw-r--r-- | app-emulation/xen-tools/ChangeLog | 5 | ||||
| -rw-r--r-- | app-emulation/xen-tools/xen-tools-4.1.2.ebuild | 16 |
2 files changed, 16 insertions, 5 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/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 |