summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2010-05-18 14:03:03 +0000
committerPeter Volkov <pva@gentoo.org>2010-05-18 14:03:03 +0000
commit802873ffaaab719a88d93453a643af5fbcea6350 (patch)
tree7914a034a363a818c351e3b254cc15b7c6d6477e /x11-plugins
parentDelete calls to deprecated python_version(). (diff)
downloadgentoo-2-802873ffaaab719a88d93453a643af5fbcea6350.tar.gz
gentoo-2-802873ffaaab719a88d93453a643af5fbcea6350.tar.bz2
gentoo-2-802873ffaaab719a88d93453a643af5fbcea6350.zip
Improve python handling, bug #317031, thank Arfrever Frehtes Taifersar Arahesis for report.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/purple-plugin_pack/ChangeLog7
-rw-r--r--x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.3.ebuild12
2 files changed, 14 insertions, 5 deletions
diff --git a/x11-plugins/purple-plugin_pack/ChangeLog b/x11-plugins/purple-plugin_pack/ChangeLog
index eacefd0091aa..baccf216d541 100644
--- a/x11-plugins/purple-plugin_pack/ChangeLog
+++ b/x11-plugins/purple-plugin_pack/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-plugins/purple-plugin_pack
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-plugin_pack/ChangeLog,v 1.31 2010/04/23 10:38:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-plugin_pack/ChangeLog,v 1.32 2010/05/18 14:03:03 pva Exp $
+
+ 18 May 2010; Peter Volkov <pva@gentoo.org>
+ purple-plugin_pack-2.6.3.ebuild:
+ Improve python handling, bug #317031, thank Arfrever Frehtes Taifersar
+ Arahesis for report.
*purple-plugin_pack-2.6.3 (23 Apr 2010)
diff --git a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.3.ebuild b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.3.ebuild
index 9df12f50ebde..97b5382a0d73 100644
--- a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.3.ebuild
+++ b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.3.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.3.ebuild,v 1.1 2010/04/23 10:38:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.3.ebuild,v 1.2 2010/05/18 14:03:03 pva Exp $
EAPI="2"
-inherit eutils
+inherit eutils python
DESCRIPTION="A package with many different plugins for pidgin and libpurple"
HOMEPAGE="http://plugins.guifications.org"
@@ -19,7 +19,11 @@ RDEPEND="net-im/pidgin[gtk?,ncurses?]
talkfilters? ( app-text/talkfilters )
spell? ( app-text/gtkspell )"
DEPEND="${RDEPEND}
- dev-lang/python"
+ =dev-lang/python-2*"
+
+pkg_setup() {
+ python_set_active_version 2
+}
list_plugins_dep() {
local dependency=${1}
@@ -30,7 +34,7 @@ src_configure() {
local plugins=""
# list all plugins, then pull DISABLED_PLUGINS with the ones we don't need
- plugins="$(python plugin_pack.py -d dist_dirs)"
+ plugins="$($(PYTHON) plugin_pack.py -d dist_dirs)"
einfo "List of all possible plugins:"
einfo "${plugins}"