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
commit57f68b162e2f46e27cae3e3cace01abe3ff13c48 (patch)
treecb68cdeb82cfb4767a8aab278edd2d96cb43ca3c /x11-plugins
parentDelete calls to deprecated python_version(). (diff)
downloadhistorical-57f68b162e2f46e27cae3e3cace01abe3ff13c48.tar.gz
historical-57f68b162e2f46e27cae3e3cace01abe3ff13c48.tar.bz2
historical-57f68b162e2f46e27cae3e3cace01abe3ff13c48.zip
Improve python handling, bug #317031, thank Arfrever Frehtes Taifersar Arahesis for report.
Package-Manager: portage-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/Manifest4
-rw-r--r--x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.3.ebuild12
3 files changed, 16 insertions, 7 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/Manifest b/x11-plugins/purple-plugin_pack/Manifest
index f471934a639b..71f0e094f415 100644
--- a/x11-plugins/purple-plugin_pack/Manifest
+++ b/x11-plugins/purple-plugin_pack/Manifest
@@ -4,6 +4,6 @@ DIST purple-plugin_pack-2.6.2.tar.bz2 688806 RMD160 53487d3be8754fe81a3ce8fe67c1
DIST purple-plugin_pack-2.6.3.tar.bz2 689569 RMD160 17fc13111e71f253e0386c6f81b7bd00e0b958ad SHA1 59e47dcf310e78758b2bed765445504fcec275e3 SHA256 5c96f6795b8c77399de8efcc3e6d11810d963cd2e613b6fccca25180e16bf9ac
EBUILD purple-plugin_pack-2.5.1-r1.ebuild 1669 RMD160 979f0095cc014525625a50478b6f14e608d0f90d SHA1 ec7aed35dcfe395d06c944224b4973eee5299fc3 SHA256 b390874a3ae9e25ff666dd566c6398bb3497b8722f17f7a0d7608945ebb15eba
EBUILD purple-plugin_pack-2.6.2-r1.ebuild 2031 RMD160 1da67515ff161b20a778f2a375e2f152b18bc7e4 SHA1 cd66b54e6acd77287e8c9571d3e4901226b72413 SHA256 ed8ec2242964c547a758a04fb405122827b2646046c9cd52e340b964a1ed14bb
-EBUILD purple-plugin_pack-2.6.3.ebuild 1960 RMD160 a11932782670685e9e89c0420725e1b6cc0b414d SHA1 dbea178d2c26565aae0245104665feb3fda9b983 SHA256 8a538ee7f746870afd285aca29ec38028d75d0ab2083fdd1d2c966f19f6eb975
-MISC ChangeLog 4636 RMD160 cdfd2afd6cc6530d7a1ca70fe28def6a4f402abf SHA1 7ef25c3af25bce1192ea6830b8ed077b376a3c41 SHA256 41c8e58a58c7329ffafe98fcba48000ee37d9c78cedf2470343b37b56431c449
+EBUILD purple-plugin_pack-2.6.3.ebuild 2020 RMD160 b3970e41becad9192aa3798ec658c861ec54ff67 SHA1 edb6cd73ca2db12464dd4a40f716895ae52efddd SHA256 20e8d07ae78e66f014d54784dc3e292337e0ad113f1f46b51dff7ce18d64d043
+MISC ChangeLog 4813 RMD160 6624b0544e8cf620398c58cb49bb313aa97e3a1d SHA1 bba4d5061338821ce5aa56cb1fc137d409661716 SHA256 74697f6abb017d68c784ed438033e2096d6d61359acbb634627b65cc448122e0
MISC metadata.xml 259 RMD160 850f51a3edf4bde0b448018fc075abda1e9aa6c3 SHA1 eb98d4e915a716139d8734f2a91cd0efeff6c2a7 SHA256 e816434b840119ef3c9b153e2e4b53206db75953e7c210f135896caa5468eca7
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}"