Fix deprecation warnings. Synchronize ebuilds.

Package-Manager: portage-2.2.0_alpha29_p9/cvs/Linux x86_64

4 files changed, 42 insertions, 26 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/Manifest b/net-p2p/deluge/Manifest
index 48b44c55f42e..c0b85030043c 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX deluge-1.2.2-versionsplit.patch 489 RMD160 4284a50f46e198d95bf40ef523b8fcf7dae30b00 SHA1 435e7b7f76c506fa7cd8ed366bad83a92bdcbfaa SHA256 88fc382fece21e29e73812487445045ce034383b3c2a09443c07345e436e2240
 AUX deluged.conf 184 RMD160 f1721fcc20b77836c783cbe4e7492748902f0428 SHA1 e330df742ae8f21e7dfbbaa31f181279ef96e3b8 SHA256 9f686931e7f5c337d4866d91ae725b0a983ee2a409eee69a197e7db8e4bc2b3d
 AUX deluged.init 2057 RMD160 1be6d3459ea5dfd912363755aebd5cbca90a6c85 SHA1 2260e7b5f48c255c8f8b59ad4e44c0eb8c76ac1f SHA256 c3c87e243d462fdc81329e22527ae2bd55f4d99bb1ca7d527aba343eec39516a
-DIST deluge-1.2.0.tar.lzma 1317506 RMD160 354fb7bced4199e154588cf6a366159b6398cf79 SHA1 e5d1304bcd2ccb6282dfe26a1e9cc34b19ec782a SHA256 65cda2026feca770bead1e79c8fb7a562bb8aff09d025ebfe3947d2d191cae89
-DIST deluge-1.2.3.tar.lzma 1371844 RMD160 4a79dd7a864fa8ae47e6b3da9a5285801931c8dc SHA1 ab036af47a797c76f1a3211dcb47a89e90adf4a2 SHA256 9980c89c254b375da8a8a74478d1bd9001f3b525938f20bb0d97147ac4af6621
-DIST deluge-1.3.0.tar.lzma 1868859 RMD160 db7cb656e4be3f0eec75d645fc1924f67ae3e646 SHA1 c8dd1225b20e9e87e9debc3f3d8170636563dae1 SHA256 c04e588caee7d2897b8af81d3e3fa05372223e17da678410df9faac676dc2774
 DIST deluge-1.3.1.tar.lzma 1869318 RMD160 8500d7bc8d03bedee66d4bb349c2db6e2eae41af SHA1 94813e975b2d9a6cd31e17b112808a148302a438 SHA256 651b42e7ceb5f00e6a280f954ecff1da3a8ae0efc9a1f5e43eda317f499ec95f
-EBUILD deluge-1.2.0.ebuild 1671 RMD160 3c94f1645d77253cfdb04f79f788b04a81e13328 SHA1 15c6d2dc346a35f43e97366cc6e1c43cc63cbbbc SHA256 c2d98c35e4e646593e517001af8971585e49ac046549bd356ef33ab663cd64a5
-EBUILD deluge-1.2.3.ebuild 1678 RMD160 213c174a5bffcf228fb27f0434ef75d8c930e41f SHA1 1feffdc262e696ddd24525c3499f353ad24cb3ad SHA256 3cbd404a133e6aa4fc4c4a9a7fa08599a8ade95322af10d98e608c626412a8bd
-EBUILD deluge-1.3.0.ebuild 1680 RMD160 746611dd749336bf004fe2ceae963019f8c96e3c SHA1 cafa4eedaf64a9b3b4e0828d3b23fe97a8b423cc SHA256 f1c9f3deaeea30b34a4e4a1a2ca25e0372baf5b704d2ece46fcc421810b9d074
-EBUILD deluge-1.3.1.ebuild 1803 RMD160 1002d4d72ca5f508d610cc0ce34a15a42013d5f4 SHA1 aa6a08b816ed87c2dbf55fec89b385da4619f1c3 SHA256 11a93f2ecbb6ced45601702383812393bac19c61f3d349a816640ec25e3c3fd9
-EBUILD deluge-9999.ebuild 1601 RMD160 d4538399ed7d08f45b27b947b5ad5006483a8736 SHA1 c87df538e93e2b64dfb6551976862603a689d2d6 SHA256 3061f5e5fffed0068ebda084119ab16f4acea10135b228f67be25e529629f8da
-MISC ChangeLog 22357 RMD160 e6a7f8913eeefc8bff00f95bff181ff24cf53086 SHA1 f7b9c902bb1ec358e829038f697218bdb109df65 SHA256 b6879989cadd43e9b2e6dc40274631557e281a4f2d6311a5624f6eaa048fe9c4
+EBUILD deluge-1.3.1.ebuild 1785 RMD160 e7cd07893524860f83c52ef4613b410befe403a7 SHA1 0d8a296073db4f5463604315f08119cb0831e2d7 SHA256 06f01347586503d8cdec381833bb1400e545bb59d0e518cf5442691aaabab655
+EBUILD deluge-9999.ebuild 1761 RMD160 cc18f58680581e7ff612894c5de3750bac752043 SHA1 735973ee83f642ea55adb0ca9cbc6a303fddd5d6 SHA256 b07fa554ec922d42e190fc80f7daefaa83816cdccbcdc079479a75f032444c83
+MISC ChangeLog 22528 RMD160 781bf99ef3ccf0e4e90801c25cca82296bc02435 SHA1 7567ded271eaacf2ff52f92d8e14ff4532295b4c SHA256 aba2f225c459986f31c0a5826b4acd64951bed5fd3436c67ee223bd946c68966
 MISC metadata.xml 322 RMD160 ba506cbedd76759bd1b14d569d0d121a1644fa75 SHA1 811976e88cb463281a74ac671ca920b9a15f15c3 SHA256 e88e99b119abf92a69e2115263e6992e6b2a6f711d810e6234c0cfaa21bc1d1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2arHgACgkQOeoy/oIi7uxiEwCg4g4e9cCfEak2nfwPYZkXX7IF
-eDIAn1sQePYjxQXQHCuCUHz9iANcvXcE
-=G8Uo
+iQIcBAEBAgAGBQJNm4bZAAoJENgZr6v6gHY0MIIQALOck0G2AftoV+a3UnxopHrR
+gSlWHdtT1rSn7EA3ndLxN2/Lwni8JB9oG0RznSpDw+5I9gliq3Rb0yhY6KOIhxjq
+sWwBjFNYXDI2BT0GCjZgH/GPZ0RFQWzP7doy0m77Y6m9zZX59uZ9vVMBoSU73pow
+O7+XYpWdCT5RbNYHtJkf6/EwrDXBBfVzm0cB+9CrVw/HF2U8F+pQsotAiP/tVrDi
+ABhaDRE3yRXQ39QItiJx7TeeQ5x9U5JgZBHPKl8zq6SEPtDsVaqckW0410hHM9A4
+4Kso+FLuJ9KCxlorJnF4CVNilcgMLJEWrKUNTge7qOD/shNmE19wupu6vsDO3sGR
+ywCFXus1U55Shrl/psqQq4U8N1nDnfL6Krk8d6Ra8lizCBar6fiUtIaG4kpOEeeT
+56t8xC/1BGWjWKsLj3Pa3ZqyoBi4uqVZ9TtcdQ+mNzQ4tn0CdAwZD7+3uhzL9Cz1
+XTQDC/XoFpNUATbEBhjFLd10UHH4+VfmnypGsUray67ClWmBmR+WZn1s5KCb2cT8
+eeunJfdiidllMAFGCZpx57gjwqCvsvHW4he9R5Nu2wk8YPoYtabHOlsa7ku6eJDe
+R/4w/gbtO7LR0BJMURtNo+U41/f9i8eaRIigZlKh76KGXxuSqD+5aolqbgAOLEyS
+D59PqottyiKQWKACmU84
+=Yz2M
 -----END PGP SIGNATURE-----
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"