summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-12-27 20:45:53 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-12-27 20:45:53 +0000
commitd7d7e7cae1a5b439a08752dd7bfba63ef42891c7 (patch)
tree7acfc01ad0b0d3cb872e3ff3b4cc6570a0b2f03b /app-backup
parentAdded Prefix keywords (diff)
downloadgentoo-2-d7d7e7cae1a5b439a08752dd7bfba63ef42891c7.tar.gz
gentoo-2-d7d7e7cae1a5b439a08752dd7bfba63ef42891c7.tar.bz2
gentoo-2-d7d7e7cae1a5b439a08752dd7bfba63ef42891c7.zip
Use Python 2 (bug #308309).
(Portage version: 2.2.0_alpha10_p9/cvs/Linux x86_64)
Diffstat (limited to 'app-backup')
-rw-r--r--app-backup/bacula/ChangeLog6
-rw-r--r--app-backup/bacula/bacula-5.0.3-r1.ebuild16
2 files changed, 17 insertions, 5 deletions
diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index 70a84627ebf1..ec79cd4de87d 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/bacula
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.105 2010/11/04 20:07:24 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.106 2010/12/27 20:45:53 arfrever Exp $
+
+ 27 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ bacula-5.0.3-r1.ebuild:
+ Use Python 2 (bug #308309).
04 Nov 2010; Thomas Beierlein <tomjbe@gentoo.org>
-files/2.4.1/2.4.1-mount.patch, -files/2.4.1/2.4.1-mysql-timeout.patch,
diff --git a/app-backup/bacula/bacula-5.0.3-r1.ebuild b/app-backup/bacula/bacula-5.0.3-r1.ebuild
index 125d5ed6bd9e..36ce160b6b9e 100644
--- a/app-backup/bacula/bacula-5.0.3-r1.ebuild
+++ b/app-backup/bacula/bacula-5.0.3-r1.ebuild
@@ -1,9 +1,13 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r1.ebuild,v 1.4 2010/11/02 19:30:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r1.ebuild,v 1.5 2010/12/27 20:45:53 arfrever Exp $
EAPI="2"
-inherit eutils multilib
+PYTHON_DEPEND="python? 2"
+PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH_OPT="python"
+
+inherit eutils multilib python
MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
@@ -41,8 +45,7 @@ DEPEND="
logwatch? ( sys-apps/logwatch )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
readline? ( >=sys-libs/readline-4.1 )
- sys-libs/ncurses
- python? ( dev-lang/python[threads] )"
+ sys-libs/ncurses"
# doc? (
# app-text/ghostscript-gpl
# dev-tex/latex2html[png]
@@ -106,6 +109,11 @@ pkg_setup() {
einfo
fi
fi
+
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
}
src_prepare() {