summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-03-03 00:31:42 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-03-03 00:31:42 +0000
commit6d6de8791f516131bdef713694b385567346a04f (patch)
tree946dbaf0642089a69df2c281ada4dfc11bbdc89a /sys-apps/dbus
parentNouveau: not compatible with libdrm-2.4.24 (diff)
downloadgentoo-2-6d6de8791f516131bdef713694b385567346a04f.tar.gz
gentoo-2-6d6de8791f516131bdef713694b385567346a04f.tar.bz2
gentoo-2-6d6de8791f516131bdef713694b385567346a04f.zip
Use Python 2 during running tests (bug #357081).
(Portage version: 2.2.0_alpha26_p5/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/dbus')
-rw-r--r--sys-apps/dbus/ChangeLog6
-rw-r--r--sys-apps/dbus/dbus-1.4.1.ebuild10
-rw-r--r--sys-apps/dbus/dbus-1.4.6.ebuild10
3 files changed, 21 insertions, 5 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 97cf5eb0efaf..8d9251a992ff 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/dbus
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.276 2011/02/26 11:52:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.277 2011/03/03 00:31:42 arfrever Exp $
+
+ 03 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ dbus-1.4.1.ebuild, dbus-1.4.6.ebuild:
+ Use Python 2 during running tests (bug #357081).
*dbus-1.4.6 (26 Feb 2011)
diff --git a/sys-apps/dbus/dbus-1.4.1.ebuild b/sys-apps/dbus/dbus-1.4.1.ebuild
index fd69b7004072..689a0094cfbb 100644
--- a/sys-apps/dbus/dbus-1.4.1.ebuild
+++ b/sys-apps/dbus/dbus-1.4.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.1.ebuild,v 1.9 2011/01/11 11:34:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.1.ebuild,v 1.10 2011/03/03 00:31:42 arfrever Exp $
EAPI="2"
-inherit autotools eutils multilib flag-o-matic virtualx
+inherit autotools eutils multilib flag-o-matic python virtualx
DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
HOMEPAGE="http://dbus.freedesktop.org/"
@@ -36,6 +36,7 @@ DEPEND="${CDEPEND}
app-text/docbook-xml-dtd:4.1.2
app-text/xmlto
)
+ test? ( =dev-lang/python-2* )
"
# out of sources build directory
@@ -46,6 +47,11 @@ TBD=${WORKDIR}/${P}-tests-build
pkg_setup() {
enewgroup messagebus
enewuser messagebus -1 "-1" -1 messagebus
+
+ if use test; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
}
src_prepare() {
diff --git a/sys-apps/dbus/dbus-1.4.6.ebuild b/sys-apps/dbus/dbus-1.4.6.ebuild
index 4b8aa239a3c3..ae29d7c4f004 100644
--- a/sys-apps/dbus/dbus-1.4.6.ebuild
+++ b/sys-apps/dbus/dbus-1.4.6.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.6.ebuild,v 1.1 2011/02/26 11:52:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.6.ebuild,v 1.2 2011/03/03 00:31:42 arfrever Exp $
EAPI=2
-inherit autotools eutils multilib flag-o-matic virtualx
+inherit autotools eutils multilib flag-o-matic python virtualx
DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
HOMEPAGE="http://dbus.freedesktop.org/"
@@ -34,6 +34,7 @@ DEPEND="${CDEPEND}
app-text/docbook-xml-dtd:4.1.2
app-text/xmlto
)
+ test? ( =dev-lang/python-2* )
"
# out of sources build directory
@@ -44,6 +45,11 @@ TBD=${WORKDIR}/${P}-tests-build
pkg_setup() {
enewgroup messagebus
enewuser messagebus -1 "-1" -1 messagebus
+
+ if use test; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
}
src_prepare() {