diff options
| -rw-r--r-- | net-p2p/deluge/ChangeLog | 6 | ||||
| -rw-r--r-- | net-p2p/deluge/deluge-1.3.1.ebuild | 13 | ||||
| -rw-r--r-- | net-p2p/deluge/deluge-9999.ebuild | 20 |
3 files changed, 26 insertions, 13 deletions
diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog index 5959bc36d8bb..bd6540b2c3a0 100644 --- a/net-p2p/deluge/ChangeLog +++ b/net-p2p/deluge/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-p2p/deluge # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.159 2011/04/05 05:44:25 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.160 2011/04/05 21:16:57 arfrever Exp $ + + 05 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + deluge-1.3.1.ebuild, deluge-9999.ebuild: + Fix deprecation warnings. Synchronize ebuilds. 05 Apr 2011; Ulrich Mueller <ulm@gentoo.org> deluge-1.2.0.ebuild, deluge-1.2.3.ebuild, deluge-1.3.0.ebuild, deluge-9999.ebuild: diff --git a/net-p2p/deluge/deluge-1.3.1.ebuild b/net-p2p/deluge/deluge-1.3.1.ebuild index 0057fbecaa4e..189bb7945143 100644 --- a/net-p2p/deluge/deluge-1.3.1.ebuild +++ b/net-p2p/deluge/deluge-1.3.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.1.ebuild,v 1.5 2010/12/20 12:29:53 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.1.ebuild,v 1.6 2011/04/05 21:16:57 arfrever Exp $ -EAPI="2" +EAPI="3" PYTHON_DEPEND="2:2.5" -inherit eutils distutils flag-o-matic python +inherit distutils flag-o-matic DESCRIPTION="BitTorrent client with a client/server model." HOMEPAGE="http://deluge-torrent.org/" @@ -16,8 +16,7 @@ SLOT="0" KEYWORDS="amd64 ~arm ~ppc ~sparc x86" IUSE="gtk libnotify webinterface" -DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils ) - >=net-libs/rb_libtorrent-0.14.9[python] +DEPEND=">=net-libs/rb_libtorrent-0.14.9[python] dev-python/setuptools" RDEPEND="${DEPEND} dev-python/chardet @@ -38,6 +37,7 @@ RDEPEND="${DEPEND} pkg_setup() { append-ldflags $(no-as-needed) python_set_active_version 2 + python_pkg_setup } src_prepare() { @@ -52,6 +52,7 @@ src_install() { } pkg_postinst() { + distutils_pkg_postinst elog elog "If after upgrading it doesn't work, please remove the" elog "'~/.config/deluge' directory and try again, but make a backup" diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild index dba73515bb59..98de1e5cf704 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-9999.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.25 2011/04/05 05:44:25 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.26 2011/04/05 21:16:57 arfrever Exp $ -EAPI="2" +EAPI="3" +PYTHON_DEPEND="2:2.5" -inherit eutils distutils git flag-o-matic +inherit distutils flag-o-matic git EGIT_REPO_URI="git://deluge-torrent.org/deluge.git" @@ -17,14 +18,13 @@ SLOT="0" KEYWORDS="" IUSE="gtk libnotify webinterface" -DEPEND=">=dev-lang/python-2.5 - >=net-libs/rb_libtorrent-0.14.9[python] +DEPEND=">=net-libs/rb_libtorrent-0.14.9[python] dev-python/setuptools" RDEPEND="${DEPEND} dev-python/chardet dev-python/pyopenssl dev-python/pyxdg - || ( >=dev-lang/python-2.6 dev-python/simplejson ) + || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) >=dev-python/twisted-8.1 >=dev-python/twisted-web-8.1 gtk? ( @@ -38,6 +38,13 @@ RDEPEND="${DEPEND} pkg_setup() { append-ldflags $(no-as-needed) + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + distutils_src_prepare + python_convert_shebangs -r 2 . } src_install() { @@ -47,6 +54,7 @@ src_install() { } pkg_postinst() { + distutils_pkg_postinst elog elog "If after upgrading it doesn't work, please remove the" elog "'~/.config/deluge' directory and try again, but make a backup" |