[gentoo-commits] repo/gentoo:master commit in: app-misc/ranger/

[Tim Harder]

commit:     969e33b7df6646d0a8b9309c8d0b19fdf43517a1
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 03:14:31 2018 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Feb  3 09:04:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=969e33b7

app-misc/ranger: version bump to 1.9.0_beta6

 app-misc/ranger/Manifest                                         | 1 +
 .../ranger/{ranger-9999.ebuild => ranger-1.9.0_beta6.ebuild}     | 9 +++++++--
 app-misc/ranger/ranger-9999.ebuild                               | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index 3a789f9808d..95ffa0315f5 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -1,2 +1,3 @@
 DIST ranger-1.8.1.tar.gz 227415 BLAKE2B 
111da01dcee27a80da7d52ca7b8296386e1ddfffb49e70ec586e6c6a16af6663450639a9699630271a9062f96a406ddf8509f35cb91dad6a278ca5953c651ab4
 SHA512 
40450d4e80017ac62d60ea6de231c10496fec1680f15a14006d3b87aae7f34cb2dbb6b810ced89527a4cba2975dcd6c037217e86fa806a0ba3cd39dc7dee8f04
 DIST ranger-1.9.0_beta5.tar.gz 235886 BLAKE2B 
730169abfb19ee95fb97d8ee95752a6eca6afa2795896db011e7bd44b6d95b01de747b3ad590682f97d7a6f2e3445c52a045f8d4afebd5abe2b94909f1f626a9
 SHA512 
728efd93630e9c8bba67f7d567200a0cb21d19d8d1b5dc4ec63a454b1169de9427c1b0477754eea1ce5b0d0ed8e79d964b4804587152e30205c1e5a73f938e0a
+DIST ranger-1.9.0_beta6.tar.gz 240948 BLAKE2B 
c0b04769aef7d5939d6b8042a7ffeaee8e59c08d9965ce72bd643dc8fc5ec5a28ec0079a21bf9e6ce4853752cb942a02a06e3c559a106c894e4fdf5f41daceac
 SHA512 
4598f813d8505ba040397b504642061bc61ebbeaa73eff86841a1976f281e6565833dce57ae1754e7329598ad1444a0d96d5bf6fc90af56d75d747e30da54996

diff --git a/app-misc/ranger/ranger-9999.ebuild 
b/app-misc/ranger/ranger-1.9.0_beta6.ebuild
similarity index 83%
copy from app-misc/ranger/ranger-9999.ebuild
copy to app-misc/ranger/ranger-1.9.0_beta6.ebuild
index 88eabf4acbf..7056b9156b4 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-1.9.0_beta6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,11 +7,14 @@ PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
 
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://github.com/ranger/ranger.git";
        inherit git-r3
 else
-       SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz";
+       SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
@@ -24,6 +27,8 @@ IUSE="test"
 RDEPEND="virtual/pager"
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
+S=${WORKDIR}/${MY_P}
+
 src_prepare() {
        # use versioned doc path
        sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || 
die

diff --git a/app-misc/ranger/ranger-9999.ebuild 
b/app-misc/ranger/ranger-9999.ebuild
index 88eabf4acbf..a078aa0428c 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://github.com/ranger/ranger.git";
        inherit git-r3
 else
-       SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz";
+       SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~ppc ~x86"
 fi