| 1 |
pacho 10/11/28 22:49:28 |
| 2 |
|
| 3 |
Modified: ChangeLog deluge-1.3.1.ebuild |
| 4 |
Log: |
| 5 |
Let this compile and work when python3 is the main interpreter (bug #315863). |
| 6 |
|
| 7 |
(Portage version: 2.1.9.25/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.155 net-p2p/deluge/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/ChangeLog?rev=1.155&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/ChangeLog?rev=1.155&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/ChangeLog?r1=1.154&r2=1.155 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v |
| 19 |
retrieving revision 1.154 |
| 20 |
retrieving revision 1.155 |
| 21 |
diff -u -r1.154 -r1.155 |
| 22 |
--- ChangeLog 17 Nov 2010 17:22:14 -0000 1.154 |
| 23 |
+++ ChangeLog 28 Nov 2010 22:49:28 -0000 1.155 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-p2p/deluge |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.154 2010/11/17 17:22:14 armin76 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.155 2010/11/28 22:49:28 pacho Exp $ |
| 29 |
+ |
| 30 |
+ 28 Nov 2010; Pacho Ramos <pacho@g.o> deluge-1.3.1.ebuild: |
| 31 |
+ Let this compile and work when python3 is the main interpreter (bug #315863). |
| 32 |
|
| 33 |
*deluge-1.3.1 (17 Nov 2010) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 net-p2p/deluge/deluge-1.3.1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-1.3.1.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-1.3.1.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-1.3.1.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: deluge-1.3.1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.1.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- deluge-1.3.1.ebuild 17 Nov 2010 17:22:14 -0000 1.1 |
| 51 |
+++ deluge-1.3.1.ebuild 28 Nov 2010 22:49:28 -0000 1.2 |
| 52 |
@@ -1,8 +1,9 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.1.ebuild,v 1.1 2010/11/17 17:22:14 armin76 Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.1.ebuild,v 1.2 2010/11/28 22:49:28 pacho Exp $ |
| 57 |
|
| 58 |
EAPI="2" |
| 59 |
+PYTHON_DEPEND="2:2.5" |
| 60 |
|
| 61 |
inherit eutils distutils flag-o-matic python |
| 62 |
|
| 63 |
@@ -15,15 +16,14 @@ |
| 64 |
KEYWORDS="~amd64 ~arm ~ppc ~x86" |
| 65 |
IUSE="gtk libnotify webinterface" |
| 66 |
|
| 67 |
-DEPEND=">=virtual/python-2.5 |
| 68 |
- || ( app-arch/xz-utils app-arch/lzma-utils ) |
| 69 |
+DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils ) |
| 70 |
>=net-libs/rb_libtorrent-0.14.9[python] |
| 71 |
dev-python/setuptools" |
| 72 |
RDEPEND="${DEPEND} |
| 73 |
dev-python/chardet |
| 74 |
dev-python/pyopenssl |
| 75 |
dev-python/pyxdg |
| 76 |
- || ( >=virtual/python-2.6 dev-python/simplejson ) |
| 77 |
+ || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) |
| 78 |
>=dev-python/twisted-8.1 |
| 79 |
>=dev-python/twisted-web-8.1 |
| 80 |
gtk? ( |
| 81 |
@@ -37,6 +37,12 @@ |
| 82 |
|
| 83 |
pkg_setup() { |
| 84 |
append-ldflags $(no-as-needed) |
| 85 |
+ python_set_active_version 2 |
| 86 |
+} |
| 87 |
+ |
| 88 |
+src_prepare() { |
| 89 |
+ distutils_src_prepare |
| 90 |
+ python_convert_shebangs -r 2 . |
| 91 |
} |
| 92 |
|
| 93 |
src_install() { |
Archives