summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2010-06-09 17:06:34 +0000
committerPeter Volkov <pva@gentoo.org>2010-06-09 17:06:34 +0000
commit7d62c8e7ef901a550e47606c0675909947e8abfb (patch)
treec74c21d3d9abdb35831458bd7549f22fbbb566b5 /net-im/pidgin
parentAdd test-fail-continue to developer's profile FEATURES. This is intended to m... (diff)
downloadhistorical-7d62c8e7ef901a550e47606c0675909947e8abfb.tar.gz
historical-7d62c8e7ef901a550e47606c0675909947e8abfb.tar.bz2
historical-7d62c8e7ef901a550e47606c0675909947e8abfb.zip
Set active python version, bug #315109, thank Arfrever Frehtes Taifersar Arahesis for report.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'net-im/pidgin')
-rw-r--r--net-im/pidgin/ChangeLog6
-rw-r--r--net-im/pidgin/Manifest4
-rw-r--r--net-im/pidgin/pidgin-2.7.1.ebuild6
3 files changed, 12 insertions, 4 deletions
diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 9086b18e0100..56d397b0f369 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/pidgin
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.167 2010/06/09 16:08:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.168 2010/06/09 17:06:34 pva Exp $
+
+ 09 Jun 2010; Peter Volkov <pva@gentoo.org> pidgin-2.7.1.ebuild:
+ Set active python version, bug #315109, thank Arfrever Frehtes Taifersar
+ Arahesis for report.
09 Jun 2010; Peter Volkov <pva@gentoo.org> pidgin-2.7.1.ebuild,
metadata.xml:
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 9ae19331cad3..2424a0b32706 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,6 +2,6 @@ AUX pidgin-2.7.0-icq-fix.patch 1991 RMD160 7158710b27950bec2d8dec47e02a4494f8dfa
DIST pidgin-2.6.6.tar.bz2 9479337 RMD160 6e2ca8fb05b2575c758537d9adc154678b36cd55 SHA1 d74459152f9598139a3fd8aee385e3366722155c SHA256 6ebbe9d339246dfebb244e4c855c4feb678f120d1024ef2ee269e2fde77b2ad9
DIST pidgin-2.7.1.tar.bz2 9647234 RMD160 5e5deec529b1c8d75cd3f925b3f5e4f5310e42e5 SHA1 b746720cc3e65b3d6da6eab0729f26673f997849 SHA256 f412a5a7389ad553229743b49399f968278095c8258dc0f89f766a6cd0ba95d1
EBUILD pidgin-2.6.6.ebuild 5214 RMD160 7b8ba0f30aecf8cf62036bfc164ed9632f1d30a3 SHA1 0d3175fa2a0964c86cbacb106cbe3045c8028fc6 SHA256 4bcb6e451bec0f2f19d1d8215adf4943c3ea5d072da66104c88f2955b225a4bb
-EBUILD pidgin-2.7.1.ebuild 5679 RMD160 43bc20fe64ea154aaaae8a604dcc59b65ae866bb SHA1 2fc0424515baef8c1f80d6bacabede4e22bc6fd8 SHA256 ab2ebc869f8f10d18474e4841e16fb3799e735e553f1c31598f61a92face40ce
-MISC ChangeLog 23311 RMD160 a651008961e7d66f5ae73b9fb3af4acc6fa77972 SHA1 f639eb963b117a9e5e302df7eadb639867513df5 SHA256 a1788f8648c2cab6f04a6d96b4e3a5b40c74adcdcdaabd49860c5b9849c9a1bf
+EBUILD pidgin-2.7.1.ebuild 5785 RMD160 18ee2364e9ec36ad7bdca44a4b32abd643742150 SHA1 480ab72d0f93abef6795ad8c46c376da64845961 SHA256 1f420850199542dc8f174ddc209063055bdba53c364a5d947bb79e5a6c4a3535
+MISC ChangeLog 23476 RMD160 e71038f422b7460986ed557a3b3a4352aa2c578b SHA1 c25734185ed2e110320e9ae7794d48826316202a SHA256 278c0e2fad97dcfdc81367793e93698e3b2c4e78ee64b30a791b6e3565556438
MISC metadata.xml 1287 RMD160 a4dbdb57292b295718c8925752fd0850056a0393 SHA1 f7ef2c046ed3bfd53a1c3b84e2724e53d3fa823b SHA256 7abefacd8163d7a36506085a0c00f14fcd56eb269e77fda65c81dd5c08fb87e1
diff --git a/net-im/pidgin/pidgin-2.7.1.ebuild b/net-im/pidgin/pidgin-2.7.1.ebuild
index dca75b4fc24d..53f1fa5c2594 100644
--- a/net-im/pidgin/pidgin-2.7.1.ebuild
+++ b/net-im/pidgin/pidgin-2.7.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.1.ebuild,v 1.2 2010/06/09 16:08:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.1.ebuild,v 1.3 2010/06/09 17:06:34 pva Exp $
EAPI=2
@@ -113,6 +113,10 @@ pkg_setup() {
if use dbus && ! use python; then
elog "It's impossible to disable linkage with python in case dbus is enabled."
fi
+ if use dbus || { use ncurses && use python; }; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
}
src_configure() {