gentoo resync : 17.02.2020

3 files changed, 4 insertions, 41 deletions

diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index 6c2f4cf77028..f1ca289f4b81 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,5 +1,3 @@
-DIST tmuxp-1.5.3.tar.gz 71095 BLAKE2B 37c62eb9d334e5cca47cb4687403ad73cfffa57919770d754fb595dc26f76d248001e62e82eb7246104b74e752701ce57fa56cc78e8eeec8dc49e1522fc6b72c SHA512 9d803e715b1b75aec8940996db579ef545f5d291e64c7d4551930ec5ad683d8a5f737cc22328f0d528e709da6f613c8b3451637ec3e93ac7e9d34aea64faa0e0
 DIST tmuxp-1.5.4.tar.gz 843048 BLAKE2B 863b428198e8bb2895802ba7365ac2ec43fc75c708b41929934b6803c79b8f6436b5233ad567f1ab010e6ae372d89261a7ee19953fa01ab9defd1e290b6da621 SHA512 f6fdecff23de883076461fcef3fb1555242d8a96f1c05c88fd0fb3216bbb99fb321680f484972b10f54ff87eb032d8627397f76960262612954eaab6bbf7c7a9
-EBUILD tmuxp-1.5.3.ebuild 892 BLAKE2B 468cdcc2f3799bba0ace9c2c34685c1441dc680dcea0a84ba65fd15fb642ab4f00612851d0d57bea7fa8aeaa71bb65db74d4d542a265d84fb53b5b734c7f2d85 SHA512 b659ad7c362c5d4f0b77a5ea68e7a622de6eff6bff931709712fe79b1cd3df963ff1f904410ff72068655bf2a6b0fd60fc6b4fe5cb7a8b9337b43451a7bd6f0f
-EBUILD tmuxp-1.5.4.ebuild 971 BLAKE2B e24a14874a855aa471e93b11db24a43c34dd7d6f22d9f5af9ad6d4e78cc3ecd5c8d15549e10babfd2243b8c84c954f3a90619dc5395f92bc31ff5bd9bc8bdf51 SHA512 22aad9f22f82384905d9362d12b8a7a87f6ebcac7a0420f861f2e7e8fe18cba428ad88f5bdd9c386af6854634894c0c9a2fbad999d2028278cf9f0d24d9b4ea9
+EBUILD tmuxp-1.5.4.ebuild 962 BLAKE2B b7eabefb4e3648791477d28f43cf13487f5b1ace4e55fcd100a1280c828f375b1ea720f890eab6c06291136c1b9e23f95a5ab22df4e27b48971bf92cdddefe77 SHA512 4fdd461b48ed0eb35afd41476d3e08f79550de9df02648c9917ad9fe954b711bc403f5da2349e91a7790af75f392f3f0df81e0257cdffed2ee7a34694144361f
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/app-misc/tmuxp/tmuxp-1.5.3.ebuild b/app-misc/tmuxp/tmuxp-1.5.3.ebuild
deleted file mode 100644
index c29c3a629500..000000000000
--- a/app-misc/tmuxp/tmuxp-1.5.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="tmux session manager. built on libtmux"
-HOMEPAGE="https://tmuxp.git-pull.com"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? (
-		>=dev-python/pytest-4.1.1[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	dev-python/kaptan[${PYTHON_USEDEP}]
-	dev-python/libtmux[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]"
-
-# tests currently failing, reported upstream
-# https://github.com/tmux-python/tmuxp/issues/486
-RESTRICT="test"
-
-python_test() {
-	SHELL="/bin/bash" py.test -v || die
-}
diff --git a/app-misc/tmuxp/tmuxp-1.5.4.ebuild b/app-misc/tmuxp/tmuxp-1.5.4.ebuild
index 9c0ad7deae68..6f66cbb13cbf 100644
--- a/app-misc/tmuxp/tmuxp-1.5.4.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.5.4.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="tmux session manager. built on libtmux"
@@ -12,11 +13,10 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/kaptan[${PYTHON_USEDEP}]
 	>=dev-python/libtmux-0.8[${PYTHON_USEDEP}]
 	<dev-python/libtmux-0.9[${PYTHON_USEDEP}]