gentoo resync : 02.03.2018

4 files changed, 7 insertions, 62 deletions

diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index 992f623b4168..3b6efd21397c 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -1,8 +1,6 @@
 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
+DIST ranger-1.9.1.tar.gz 245872 BLAKE2B 3ed48c4fe0cb42be7e001508a9c1f558e415e155eb5f68c9a8eb3e6d906ad287080391ab0310c0e9d67c9bc3210621827dc11107d99ac4173a4d8c64d74ab28b SHA512 c7fdc8f423860c7c420d7be61ebcc92629e444529c982f24260a9eeb68452adbbc6d40d53921c556da3d08a75b1c718bb05257cf869a15f7d932e8f00836cfe3
 EBUILD ranger-1.8.1.ebuild 887 BLAKE2B eeee3bb45d132f4602091a278a0706a0510722ff81ea9fbadf2ed0adcecd95e5a0dcce9fb8c4855445259f24219a6560069815d3f032c7d36f701c933790f96f SHA512 b2a9e9d613e92efcee3c87b77e36d1577cddd0ba0e88295971bf1e62d0e6f115ca27bb9aacbaa07f90e794087ebf82c605a82e7f5eb99141244f1ae5b87b6b56
-EBUILD ranger-1.9.0_beta5.ebuild 1120 BLAKE2B d43a100c9531d76d51f5e63de11dab9b45ed7eac6ba2cc336d7a78338d2e760db1daf8a3dc6dcedb8872636aafd2fc8f7bd2f50ec40b706fb003ad10965630af SHA512 359fe404649aee1ad24078dc740f4094520e8137d8c5e684b31adefaf9d3a7055d8f3f23182f8f9854d263159b56524d25f625ad82bf8f35ae5d396169f3de1c
-EBUILD ranger-1.9.0_beta6.ebuild 1120 BLAKE2B eb74b1560eda590f6781001a3ee9020fef8fbd55a6c249973c63bffd9fe4c6197cc9d87251123f03aa84fbf9adc97d879cd340e3cffb05a4965364bc4d8815c8 SHA512 50043c251c94ce850ddd2e0beb4f4f2f6ebf43ed698b7644e2a437450c7486904ba2ab896b16d16124e85500668a31d5ae1ca4ab555567395d7299eeb6f08816
-EBUILD ranger-9999.ebuild 1057 BLAKE2B bc5214a1b7b8b532be1738a7f2c9965fed1cca22176799959f9faf66edcb0b2a738c8b8c12a3fe3df0b60a928e04f17b19aecd07d51b666a697273da53f21041 SHA512 9355061867ce3a78b383cf0bb960d478e5c0f44f7c2efaa1488380f04abe9689335c5d725b398a2901b0e42659cd3ea54b4e82647e08aa73e0448f0c2e0d38e2
+EBUILD ranger-1.9.1.ebuild 1067 BLAKE2B 23524c8eebfd5d84974df81e8ab781b155558563d42900d87145561f850e2f1433709f54387f91933ff92231342477df486f6bf79850126211aa36505abeaa62 SHA512 a669db30a0478fdeca3778054acccfce5e9cfb388b009d32afe15a3490f21e89fcf130c5f659b0d5e7a8f88001bdf48630572ac31314f02e1a01c2062c66ca65
+EBUILD ranger-9999.ebuild 1067 BLAKE2B 23524c8eebfd5d84974df81e8ab781b155558563d42900d87145561f850e2f1433709f54387f91933ff92231342477df486f6bf79850126211aa36505abeaa62 SHA512 a669db30a0478fdeca3778054acccfce5e9cfb388b009d32afe15a3490f21e89fcf130c5f659b0d5e7a8f88001bdf48630572ac31314f02e1a01c2062c66ca65
 MISC metadata.xml 694 BLAKE2B b7b43401693937cbe92d0737972b55168f10ad3e8c9b1cd66db850bdf1b1517445c6c0258f805f5d3f8f4a00a27efb4e5235d46739dac7daaada1d323d08b19e SHA512 d6a97f7a6342dc1f1e14fbb14f2c0d28b5c2d2f148b0ac4078421e85f25273b38d489009c1780570326d374196a1a93cdb4aa86de55265db643092affe610e54
diff --git a/app-misc/ranger/ranger-1.9.0_beta5.ebuild b/app-misc/ranger/ranger-1.9.0_beta5.ebuild
deleted file mode 100644
index 92d244bf1345..000000000000
--- a/app-misc/ranger/ranger-1.9.0_beta5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-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="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-DESCRIPTION="A vim-inspired file manager for the console"
-HOMEPAGE="https://ranger.github.io/"
-LICENSE="GPL-3"
-SLOT="0"
-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
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Ranger has many optional dependencies to support enhanced file previews."
-		elog "See the README or homepage for more details."
-	fi
-}
diff --git a/app-misc/ranger/ranger-1.9.0_beta6.ebuild b/app-misc/ranger/ranger-1.9.1.ebuild
index 7056b9156b43..363a06f282ac 100644
--- a/app-misc/ranger/ranger-1.9.0_beta6.ebuild
+++ b/app-misc/ranger/ranger-1.9.1.ebuild
@@ -7,14 +7,11 @@ 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="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
@@ -27,8 +24,6 @@ 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
@@ -37,7 +32,7 @@ src_prepare() {
 }
 
 python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
+	py.test -v tests/ranger || die "Tests failed under ${EPYTHON}"
 }
 
 pkg_postinst() {
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index a078aa0428c5..363a06f282ac 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/ranger/ranger.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
@@ -32,7 +32,7 @@ src_prepare() {
 }
 
 python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
+	py.test -v tests/ranger || die "Tests failed under ${EPYTHON}"
 }
 
 pkg_postinst() {