From 39619c47f828a3dfb68cacc785d93e85961d15e6 Mon Sep 17 00:00:00 2001
From: Andrew Ross <aross@gentoo.org>
Date: Sat, 30 Sep 2006 01:19:34 +0000
Subject: Backport upstream fix to allow building with python-2.5 (Gentoo bug
 #149138).

svn path=/; revision=11
---
 app-emulation/xen-tools/Manifest                  | 8 ++++----
 app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 802e82c..ec8c72d 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -43,10 +43,10 @@ EBUILD xen-tools-3.0.2-r3.ebuild 5530 RMD160 fe932ebe8722970f5a433a0619552c6ec2f
 MD5 11588a83ffd3177430efeca5cc668ba3 xen-tools-3.0.2-r3.ebuild 5530
 RMD160 fe932ebe8722970f5a433a0619552c6ec2f93eaf xen-tools-3.0.2-r3.ebuild 5530
 SHA256 cff3399ef7a791cafcf2053c00124ab56772b730ac8aa32a088ced857b011c1e xen-tools-3.0.2-r3.ebuild 5530
-EBUILD xen-tools-3.0.2-r4.ebuild 4845 RMD160 d38734ae0b2f5cc36be333ff4897f0919ea8526f SHA1 f7068dc243a395faf5e34ed9f9fe78a3da46ff88 SHA256 301c172fe3cfbbb570797496bb9476db259455d52d0eb8ff2e89dc530b9d73f2
-MD5 4ec6b74be666ec55ca9ec405d9651232 xen-tools-3.0.2-r4.ebuild 4845
-RMD160 d38734ae0b2f5cc36be333ff4897f0919ea8526f xen-tools-3.0.2-r4.ebuild 4845
-SHA256 301c172fe3cfbbb570797496bb9476db259455d52d0eb8ff2e89dc530b9d73f2 xen-tools-3.0.2-r4.ebuild 4845
+EBUILD xen-tools-3.0.2-r4.ebuild 5012 RMD160 91906194176d72ce5a35882e75fc8c909e350c06 SHA1 25917b0153e4ef9ea1a9a491a1c15ccbac734c69 SHA256 425ad4588561233b78aa7b06fb9135f7da5432b41dcd18b761d892aea6e056ce
+MD5 90e8cf66bf8e9d678ad1cd133527b5a9 xen-tools-3.0.2-r4.ebuild 5012
+RMD160 91906194176d72ce5a35882e75fc8c909e350c06 xen-tools-3.0.2-r4.ebuild 5012
+SHA256 425ad4588561233b78aa7b06fb9135f7da5432b41dcd18b761d892aea6e056ce xen-tools-3.0.2-r4.ebuild 5012
 MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r3 235
 RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r3 235
 SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r3 235
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
index fc69e84..a27fbba 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
@@ -90,6 +90,10 @@ src_unpack() {
 	# Allow --as-needed LDFLAGS
 	epatch "${FILESDIR}/${P}"--as-needed.patch
 
+	# Allow building with python-2.5 (bug #149138)
+	# Backported from upstream - should be in 3.0.3
+	sed -i 's/\.2|^2\.3|^2\.4/.[2345]/' "${S}"/tools/check/check_python
+
 	# Fix upstream's broken test cases (bug #141233)
 	epatch "${FILESDIR}/${P}"-test-uuid.patch
 	epatch "${FILESDIR}/${P}"-test-xauthority.patch
-- 
cgit v1.2.3-65-gdbad