summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2010-03-08 03:29:41 +0000
committerRyan Hill <dirtyepic@gentoo.org>2010-03-08 03:29:41 +0000
commitf2c04e0e7b56335e7b229756605ee9466bed75d3 (patch)
tree153c20fa0af8869bf25029baac903c057ef8ef67
parentMore python fixes for bug #308351. (diff)
downloadgentoo-2-f2c04e0e7b56335e7b229756605ee9466bed75d3.tar.gz
gentoo-2-f2c04e0e7b56335e7b229756605ee9466bed75d3.tar.bz2
gentoo-2-f2c04e0e7b56335e7b229756605ee9466bed75d3.zip
More python fixedness.
(Portage version: 2.2_rc65/cvs/Linux x86_64)
-rw-r--r--net-p2p/nicotine+/ChangeLog5
-rw-r--r--net-p2p/nicotine+/nicotine+-1.2.15.ebuild11
2 files changed, 11 insertions, 5 deletions
diff --git a/net-p2p/nicotine+/ChangeLog b/net-p2p/nicotine+/ChangeLog
index 753b4c980a2a..eb29112cc59d 100644
--- a/net-p2p/nicotine+/ChangeLog
+++ b/net-p2p/nicotine+/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-p2p/nicotine+
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.44 2010/03/08 00:54:58 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.45 2010/03/08 03:29:41 dirtyepic Exp $
+
+ 08 Mar 2010; Ryan Hill <dirtyepic@gentoo.org> nicotine+-1.2.15.ebuild:
+ More python fixedness.
08 Mar 2010; Jonathan Callen <abcd@gentoo.org> nicotine+-1.2.15.ebuild:
Move PYTHON_DEPEND before inherit(), so that the dep is actually added
diff --git a/net-p2p/nicotine+/nicotine+-1.2.15.ebuild b/net-p2p/nicotine+/nicotine+-1.2.15.ebuild
index 1e927203a2ff..d7726d40ea2f 100644
--- a/net-p2p/nicotine+/nicotine+-1.2.15.ebuild
+++ b/net-p2p/nicotine+/nicotine+-1.2.15.ebuild
@@ -1,11 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.15.ebuild,v 1.2 2010/03/08 00:54:58 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.15.ebuild,v 1.3 2010/03/08 03:29:41 dirtyepic Exp $
-EAPI=2
-SUPPORT_PYTHON_ABIS=1
+EAPI="2"
PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
inherit distutils python
@@ -27,7 +25,12 @@ RDEPEND=">=dev-python/pygtk-2.12
DEPEND="${RDEPEND}"
+pkg_setup() {
+ python_set_active_version 2
+}
+
src_install() {
distutils_src_install
+ python_convert_shebangs -r 2 "${D}"
dosym nicotine.py /usr/bin/nicotine
}