[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     fc5e2cd290b1b9438248695b401837ce89a56cec
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Mon Jun 20 10:09:09 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 19:44:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc5e2cd2

net-p2p/deluge: Add stable live ebuild

Also fixes some tabs vs spaces issues

 net-p2p/deluge/deluge-1.3.12-r4.ebuild                            | 4 ++--
 .../deluge/{deluge-1.3.12-r4.ebuild => deluge-1.3.9999.ebuild}    | 8 ++++----
 net-p2p/deluge/deluge-9999.ebuild                                 | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.12-r4.ebuild 
b/net-p2p/deluge/deluge-1.3.12-r4.ebuild
index 812e7f2..d5a9bef 100644
--- a/net-p2p/deluge/deluge-1.3.12-r4.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12-r4.ebuild
@@ -84,8 +84,8 @@ esetup.py() {
        # Override this call from the distutils-r1 eclass.
        # This does not respect the distutils-r1 API. DONOT copy this example.
        set -- "${PYTHON}" setup.py "$@"
-    echo "$@"
-    "$@" || die
+       echo "$@"
+       "$@" || die
 }
 
 python_install_all() {

diff --git a/net-p2p/deluge/deluge-1.3.12-r4.ebuild 
b/net-p2p/deluge/deluge-1.3.9999.ebuild
similarity index 97%
copy from net-p2p/deluge/deluge-1.3.12-r4.ebuild
copy to net-p2p/deluge/deluge-1.3.9999.ebuild
index 812e7f2..0090456 100644
--- a/net-p2p/deluge/deluge-1.3.12-r4.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -12,10 +12,11 @@ inherit distutils-r1 eutils systemd user l10n
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="http://deluge-torrent.org/";
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == 1.3.9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
                http://git.deluge-torrent.org/${PN}";
+       EGIT_BRANCH="1.3-stable"
        SRC_URI=""
        KEYWORDS=""
 else
@@ -32,7 +33,6 @@ REQUIRED_USE="
        libnotify? ( gtk )
 "
 PATCHES=(
-       "${FILESDIR}/${PN}-1.3.12-fix_scheduler_plugin.patch"
        "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
 )
 
@@ -84,8 +84,8 @@ esetup.py() {
        # Override this call from the distutils-r1 eclass.
        # This does not respect the distutils-r1 API. DONOT copy this example.
        set -- "${PYTHON}" setup.py "$@"
-    echo "$@"
-    "$@" || die
+       echo "$@"
+       "$@" || die
 }
 
 python_install_all() {

diff --git a/net-p2p/deluge/deluge-9999.ebuild 
b/net-p2p/deluge/deluge-9999.ebuild
index a8a9ca6..33cd876 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -83,8 +83,8 @@ esetup.py() {
        # Override this call from the distutils-r1 eclass.
        # This does not respect the distutils-r1 API. DONOT copy this example.
        set -- "${PYTHON}" setup.py "$@"
-    echo "$@"
-    "$@" || die
+       echo "$@"
+       "$@" || die
 }
 
 python_install_all() {