Version bump to 1.3.11 and to EAPI 5 for bug #517072; thanks Mark R. Pariente. Drop old ebuilds and python 2.5/2.6 dependencies. Rebase -9999 to 1.3.11. Migrate from distutils to distutils-r1.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
RepoMan-Options: --force

6 files changed, 71 insertions, 208 deletions

diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index 67dc4900f260..011376180a52 100644
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-p2p/deluge
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.189 2014/08/10 20:36:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.190 2014/12/01 05:54:08 heroxbd Exp $
+
+*deluge-1.3.11 (01 Dec 2014)
+
+  01 Dec 2014; Benda Xu <heroxbd@gentoo.org> +deluge-1.3.11.ebuild,
+  -deluge-1.3.3.ebuild, -deluge-1.3.5-r2.ebuild, -deluge-1.3.5.ebuild,
+  deluge-9999.ebuild:
+  Version bump to 1.3.11 and to EAPI 5 for bug #517072; thanks Mark R. Pariente.
+  Drop old ebuilds and python 2.5/2.6 dependencies.  Rebase -9999 to 1.3.11.
+  Migrate from distutils to distutils-r1.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> deluge-1.3.3.ebuild,
   deluge-1.3.5-r2.ebuild, deluge-1.3.5.ebuild, deluge-1.3.6.ebuild,
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 521fdb3d2f7e..13a039ef40b9 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,26 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX deluge-1.3.5-disable_libtorrent_internal_copy.patch 1161 SHA256 8d5f40baaabc78ecbaaa1be4273c4ca2aa95e90e1d9d8e3193ec5d2c77e6b2da SHA512 afd5e8909dc1d403d94ddcfe2acd537f5b483bc6104d6d8cfb4b9c291e14b378341b18cf8f053a29a9a64416458098fe1c49279ab82a448f80334fb620cf04ba WHIRLPOOL 6d2a0ff55b792091ead6b47f39795a4d7b19faa94b99cdb66ecca307872e501974ef2a07c62d419394551862f281e0d1fe3d3eda883cc50adf3dd69c2031bee9
 AUX deluge-1.3.5-rb_libtorrent-disable-python-bindings 2883 SHA256 4764bd3d7fbabeb68fd3776c5dfde0eabaad3cdd71eef97fdd5daaae4d4a4587 SHA512 72d1dba662b24aef3e5ddd9ed9a2a672075d8c858c53230f1cb011e6ad23d9711f71d848173133fa215105450b30db17a7dce7d2ef4631f2add4079d1b38a380 WHIRLPOOL da9733d77adb067981b0f0a7dfd43fd5d1c01027e7a881bf7956f144f2975fcc1572ab8bae7a9e63d2225fc0a40ee1b55d0b20d45f101f4ddc0d7f41e2fb63e1
 AUX deluge-web.service 146 SHA256 7b829d7e0d15e0369a26f92e0fb15adae81007de170a6ba3f8afa74e675eabb3 SHA512 b189d5db4be60a01eb5950aad3cb0bd60a1ac9509464507d5187c7b387d2f78678e65db3d0340c87c50511b48d08c85f7380c9d405e5dc497eca121aaaeacfaa WHIRLPOOL b1798eaaf71e3f3c5fd53c49a2b48cefee615c378d4a43bed6c19afa523cf5d23f57181095ef4c439c8a3ebc152e75735f2f47e0ec53288a54ff5196dac5e037
 AUX deluged.conf 210 SHA256 9ac696396eaaebd4a7759af6d61cf470bfd0e0fbf5de11a7b26b7456514eb568 SHA512 66e80e4688fa085ee8e9efa424f3c1050a9ed133f2198f5c671e180f64a5855fdeb7b8affabbad769dece15a037f338f458298f167ee29a243b747ffaf65e079 WHIRLPOOL 6fd23121e6e7e4976952cc904e3212d0d0fb4b9da54a542fc1e0fa256ccc1442c4cfa883cdd88b32082589c7ec9003aa3406ddfa720d87c75723761a2e4dc842
 AUX deluged.init 2055 SHA256 e61ad364bd7c2f87fc463a56f3f191341a9e528a3fb3f08a10026a67fa813e33 SHA512 31832cd4df8399101f072869c2cad7ff7ed6481d35d913000f2e8c0b96d24625aa9b795cc84442afe4128752261becc8a110869203def3ce7e849f82f76855a6 WHIRLPOOL 83fa16e77486d141b9a51bca8bbc7046064fc0ecc0035e38d8f8401c8eced0b646110cffd054a5592058aa51ec0fd113dfbf5dc769f227a38ef829d156bab5d2
 AUX deluged.service 277 SHA256 6347ec82b7a28daabe441e3436fdc725e96dae2249ccf8fb2452168368750000 SHA512 fea157a271d768a1b6025b32b97b2b88f5b70472a7059da7fa4babb4f1a686e33e04cc4bd7a5daf70a5f682252687495bbe72eb1c1b335857817f45ed4f1dd33 WHIRLPOOL 38f66dffa09250a73990a4bc76f230e8d4c8e9ad4c87167fdb2144f0a7c3210017500030ed2a4a381bcba82ee8cc45cb518688d752a453be02f7ddd69b5c0e7d
-DIST deluge-1.3.3.tar.lzma 2094978 SHA256 c40e0f5757bc3912e9628e1a68dfa41cd487beca370c315f5d31261b931cea05
-DIST deluge-1.3.5.tar.lzma 2100244 SHA256 cdb97fd64cc2131da812fad026f49e82f82b6a214e592222145ddcfb19174247 SHA512 755b5cd72dcdff0cb54d1fac5ad539f42db78a4ea8a71e13d5d493810c2d1b69865bd0026ddc14ea8fc51eb454398248524ad91bbbc8303792dd8a0513900d45 WHIRLPOOL 7f19c6ee4785b48d8c20b00ee67dfeccf1355c0ae36faf953f411bd3e977d11b7fb4fac1456cf91e0ff117021b25e6673432afd03cc1270178486867c5b89c88
+DIST deluge-1.3.11.tar.bz2 1792459 SHA256 83e1f41b8a2a6e7ba86a54474692d4686db509b75441173d9603447f9e0ec898 SHA512 d56c03f3c687cdee65f8d7f26728a46cae1fd665c49313bd2b91243d26df0f5b2292048fd542333cbc538383eb53cd961bc3427230f9081317268735df367272 WHIRLPOOL 52820837a24ef3d4917a1b018fa30c8ec662a6c2366cb848fb984b716175bad63131e7cc4eea7688405e380102cf0ebb5ae4b58dcd7c90fd7dde9dcc9dada444
 DIST deluge-1.3.6.tar.bz2 1725202 SHA256 756a025d88752f39133aa34d8fc96d4ce216113919488d60098ee41f860a1f60 SHA512 22a8308c139e95190b3832ee9547e7c84a56cf1cc6f18ecebaf7af7997d73efe41664fd875e7e1753eb0b1e616f12e5e54f5fb2790261753b85f5512b8882e12 WHIRLPOOL f43a5ae5a94fc49cb76ee3561b18b9aeaff759c72a77d629170f4294e63c90f883e346eb0a5c75c0d13683fdf1848b07af2bfcd6432253cd40642735e50d10e1
-EBUILD deluge-1.3.3.ebuild 1808 SHA256 3dba4d6f17d37a63acc71e193eaaff595d300c05f1a6b2c180f3aae96bbf9708 SHA512 1bacf5e5e28ba553957900999ebee00e8282ae3465fc1512bca80d4de6d86fcbb8b8d7f48a58ac1697d47ec282d44823b8c18da1b9c2944690e9bfc096bc399b WHIRLPOOL 475a30ccc339984ee64e8ff5ed199d36694a761c011724c28cc63761ef9a357142dc67e805aa7de505786fa302b9835ab8ebc2567f8e006bb0d2825ac55341bb
-EBUILD deluge-1.3.5-r2.ebuild 2048 SHA256 e97841fd51282dd0573a8dc265234ac7faabe0db41f989600929fe2978848920 SHA512 84f9f320df0d62f732869b7b6a2bc006aaa38d76eab6e97dd94bc237f8b37f6b33d4d681a0c72bf35874bff4cd3a1676cdb16ed0db5b789ce94c5797caa26f11 WHIRLPOOL 730e7fe4ed3b8b659a39b5f0595baf5439fda9d8511df3e318c731f2341a584338eba22cd61c9aae8c07e0d7e6ab9b6f63cf34cd10a760f89046b936dbd2066d
-EBUILD deluge-1.3.5.ebuild 1897 SHA256 1a5a6f83d90fa879b0e0273ea1b40737c9f4f4e940c7912fa54d28ba0752c1c0 SHA512 95b25c857cec0c526d4a7daafc47b7f440b98e88d25a06f5123147be98561b249a01b5ea6914af18513a4ae2643ee48b86dccf0e89c8625405f82941c34ba690 WHIRLPOOL 0125e4f7db6d728b9038844871526a541368379e4b6b94a5c7410f33423caec6ad5dbbbb1108c2994087e3e64d83782d05cd4fb31e03c91a97f757023af12157
+EBUILD deluge-1.3.11.ebuild 2124 SHA256 6e56831a5e307f148275359998fb5a4807432a82c3cc7589beadc5576e8d66ef SHA512 9a4ed5cb7c80a226469a9d3ee8309b457f506af6d0f2c8d51c55af98748090103451dc8c0e1331bdf718ae771af883f2f8d85a6bc100bf82a4383b76f2dee412 WHIRLPOOL a96b1334026490a1f004aa3a811d42e47404448f2de622d3657c75d92525d379ce60a1286d711020c522d9b151dedd763eeabeb4c2a51592e662b1c7332879b9
 EBUILD deluge-1.3.6.ebuild 2059 SHA256 b9032a10c27d1988778c2fa1ae047b2b33fae119fa988aceb0e43c565e40e21b SHA512 d256c48c186ce40e8fa37d3e1106cb5c2a2b8a1deb1b4980fcbc7587fdc3f7c572545013ccb16163bbe0fb13fba907c19a4289c3ea2d6957955018563fbbc9c7 WHIRLPOOL 4c4a87ba88ee9852b2599c8d9459ddb6fe78504385015a0dc6b7001380b83e4ed527e4e34e3d8023116536ef57d833f26793100a5201a9dd8c61440b7195a548
-EBUILD deluge-9999.ebuild 1921 SHA256 3c82dc3bfe06ce7826c85f54ff87e85ab25d5f91e7602bdfc28b6482de654d71 SHA512 c79f4ab37099a51b466edb4bfa5b3c38d52c506cb3a0c9ddf5219cf6a34698f702601cc658dade3e8662a1c8d1954f0faf1dacad4b71f56ab7a0ed5a2330d059 WHIRLPOOL e22b23f482a9d591cab734143865286b2954a6ef2c85dbca6f66e5b4f3c835c1263bb9fb22e73b5716deb9f03fe6031c34a5319c83f5c49738de5117c97b3076
-MISC ChangeLog 26798 SHA256 9fdd8cb553d10b240585fd28ed8555ecd2cef12765d28cbddfab1676c2588d0a SHA512 4821a683ced2f98d780ddcdaaaeee1ba2f0f431b25b5c2714c21fd8503493f604b3c701bde231bb8e18d52a7c5ef2eea30a5d21845f596eb637dc3fdb90382a4 WHIRLPOOL cf6cef09d1f98c7ea6787df16d1d8a71db54b31da94aa9de0f8fac4a5f9f31d1e201bed7edfd122f801a317d7072062d9dae9aacc5e4c9045bd6bb1dc538018d
+EBUILD deluge-9999.ebuild 2123 SHA256 d6dc7e36bb883096dda22e08fc5b73c8aa9b3c789bd25e546a6ef98f8efcfa6f SHA512 b2782bb3160a0a526db6f941f4a715712ed9e7bfd0d33c15bebf088c03396ef3d69237b14af3921f4b625ccd8bfd620b39fa7d3edb31b9b3a668197556f58a7a WHIRLPOOL d667488eb1a2a8dbd8e9ca28a8d03d7bf0c4919b652bd96935735deae7453e4d5b6f87f93c01440f46220dc19dacd1ed937619bb6ddb5b5564ce087f44550cbe
+MISC ChangeLog 27191 SHA256 bb27c0680b684a7254a0977eb96593f520e0abbade41027cabf4d7c4e2fea4cd SHA512 a7f327414b19f3d2cc6ebb7587464c35dfcd97b9151e296c389cf005d987af820a40da0f36ded28db447c98f2ba15fb4aba4cdce765bf5c38b6c2bc58f037c04 WHIRLPOOL 1f0f00b83758c342f04973ced7ec2167b8555d728cb90827242e47a9da1ef62db7bbf48ac01c7c447693452f30165adf8a504efa080dec19fd59ac5e0ed0a4dd
 MISC metadata.xml 356 SHA256 659ce61ec4c1475764f4d7a515780577bcdfc81e814291fa429ed77fcb6c4bdb SHA512 c4aac10613fd08fb8e65b7f1e4141c569981d77629608a70309fbe0d5eade6c117d1a5883bf1baa37e6ced100fba807798594551219cfbb89a748dfdf730914d WHIRLPOOL 95f609ffb59d9e893047c83d51459e1f5b4197dbf1bf9f0cf85ef47f7903217f56fa3d479b5c2134469bd359c703b20c2dd77263e0f51811a41a46694b681582
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn19MACgkQcaHudmEf86rI8gCdGYKp2Q5Fqg7oB96uvLBPDc/K
-Vz8An0GGBo53azka9ldEuWuM7If7s2gp
-=PfiC
------END PGP SIGNATURE-----
diff --git a/net-p2p/deluge/deluge-1.3.5-r2.ebuild b/net-p2p/deluge/deluge-1.3.11.ebuild
index c4c3b4a59d76..2322482b454d 100644
--- a/net-p2p/deluge/deluge-1.3.5-r2.ebuild
+++ b/net-p2p/deluge/deluge-1.3.11.ebuild
@@ -1,34 +1,42 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r2.ebuild,v 1.6 2014/08/10 20:36:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.11.ebuild,v 1.1 2014/12/01 05:54:08 heroxbd Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
+EAPI="5"
 
-inherit distutils eutils flag-o-matic python
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 eutils systemd
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="http://deluge-torrent.org/"
-SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.lzma"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE="geoip gtk libnotify setproctitle webinterface"
+IUSE="geoip gtk libnotify setproctitle sound webinterface"
 
 DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
-	dev-python/setuptools
 	dev-util/intltool"
-RDEPEND="${DEPEND}
+RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
 	dev-python/chardet
 	dev-python/pyopenssl
 	dev-python/pyxdg
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
 	>=dev-python/twisted-core-8.1
 	>=dev-python/twisted-web-8.1
 	geoip? ( dev-libs/geoip )
 	gtk? (
-		dev-python/pygame
+		sound? ( dev-python/pygame )
 		dev-python/pygobject:2
 		>=dev-python/pygtk-2.12
 		gnome-base/librsvg
@@ -37,28 +45,23 @@ RDEPEND="${DEPEND}
 	setproctitle? ( dev-python/setproctitle )
 	webinterface? ( dev-python/mako )"
 
-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 .
-	epatch "${FILESDIR}/${P}-rb_libtorrent-disable-python-bindings"
-	epatch "${FILESDIR}/${P}-disable_libtorrent_internal_copy.patch"
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
+	)
 
+	distutils-r1_python_prepare_all
 }
 
-src_install() {
-	distutils_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 	newinitd "${FILESDIR}"/deluged.init deluged
 	newconfd "${FILESDIR}"/deluged.conf deluged
+	systemd_dounit "${FILESDIR}"/deluged.service
+	systemd_dounit "${FILESDIR}"/deluge-web.service
 }
 
 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-1.3.3.ebuild b/net-p2p/deluge/deluge-1.3.3.ebuild
deleted file mode 100644
index 35284f52c88c..000000000000
--- a/net-p2p/deluge/deluge-1.3.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.3.ebuild,v 1.7 2014/08/10 20:36:34 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit distutils flag-o-matic
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-IUSE="gtk libnotify webinterface"
-
-DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
-	dev-python/setuptools
-	dev-util/intltool"
-RDEPEND="${DEPEND}
-	dev-python/chardet
-	dev-python/pyopenssl
-	dev-python/pyxdg
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
-	>=dev-python/twisted-core-8.1
-	>=dev-python/twisted-web-8.1
-	gtk? (
-		dev-python/pygame
-		dev-python/pygobject:2
-		>=dev-python/pygtk-2.12
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python )
-	)
-	webinterface? ( dev-python/mako )"
-
-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() {
-	distutils_src_install
-	newinitd "${FILESDIR}"/deluged.init deluged
-	newconfd "${FILESDIR}"/deluged.conf deluged
-}
-
-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"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-1.3.5.ebuild b/net-p2p/deluge/deluge-1.3.5.ebuild
deleted file mode 100644
index d9ae0b447bfd..000000000000
--- a/net-p2p/deluge/deluge-1.3.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5.ebuild,v 1.6 2014/08/10 20:36:34 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit distutils flag-o-matic
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-IUSE="geoip gtk libnotify setproctitle webinterface"
-
-DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
-	dev-python/setuptools
-	dev-util/intltool"
-RDEPEND="${DEPEND}
-	dev-python/chardet
-	dev-python/pyopenssl
-	dev-python/pyxdg
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
-	>=dev-python/twisted-core-8.1
-	>=dev-python/twisted-web-8.1
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		dev-python/pygame
-		dev-python/pygobject:2
-		>=dev-python/pygtk-2.12
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python )
-	)
-	setproctitle? ( dev-python/setproctitle )
-	webinterface? ( dev-python/mako )"
-
-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() {
-	distutils_src_install
-	newinitd "${FILESDIR}"/deluged.init deluged
-	newconfd "${FILESDIR}"/deluged.conf deluged
-}
-
-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"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index e345fe20b33c..d1d0831f3e9b 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,36 +1,42 @@
 # Copyright 1999-2014 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.35 2014/08/10 20:36:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.36 2014/12/01 05:54:08 heroxbd Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
+EAPI="5"
 
-inherit distutils git-2
-
-EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-	http://git.deluge-torrent.org/${PN}/"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 eutils systemd
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="http://deluge-torrent.org/"
-SRC_URI=""
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="geoip gtk libnotify setproctitle webinterface"
+IUSE="geoip gtk libnotify setproctitle sound webinterface"
 
 DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
-	dev-python/setuptools"
-RDEPEND="${DEPEND}
+	dev-util/intltool"
+RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
 	dev-python/chardet
 	dev-python/pyopenssl
 	dev-python/pyxdg
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
 	>=dev-python/twisted-core-8.1
 	>=dev-python/twisted-web-8.1
 	geoip? ( dev-libs/geoip )
 	gtk? (
-		dev-python/pygame
+		sound? ( dev-python/pygame )
 		dev-python/pygobject:2
 		>=dev-python/pygtk-2.12
 		gnome-base/librsvg
@@ -39,25 +45,23 @@ RDEPEND="${DEPEND}
 	setproctitle? ( dev-python/setproctitle )
 	webinterface? ( dev-python/mako )"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
+	)
 
-src_prepare() {
-	distutils_src_prepare
-	python_convert_shebangs -r 2 .
-	epatch "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+	distutils-r1_python_prepare_all
 }
 
-src_install() {
-	distutils_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 	newinitd "${FILESDIR}"/deluged.init deluged
 	newconfd "${FILESDIR}"/deluged.conf deluged
+	systemd_dounit "${FILESDIR}"/deluged.service
+	systemd_dounit "${FILESDIR}"/deluge-web.service
 }
 
 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"