gentoo resync : 15.12.2019

4 files changed, 13 insertions, 72 deletions

diff --git a/dev-python/pychroot/Manifest b/dev-python/pychroot/Manifest
index 84d8823d852c..f3f30ced58ff 100644
--- a/dev-python/pychroot/Manifest
+++ b/dev-python/pychroot/Manifest
@@ -1,6 +1,4 @@
-DIST pychroot-0.10.0.tar.gz 23960 BLAKE2B 6d22ccbf3d71854d863577f0cf5ec3b1bea40f0f80d5c07942520d5d522ee299222e96cab4893c9cab93866c7f881052f67ad9091267c329a772fc4c3065bae1 SHA512 4a3941da9a94b75963e72536ec8f6218564dbdcb97e6314562044eb55f523e0704aecbc81e8e377338781e8bfd1a2aafb22cdc82f37bdb198a03e0e30d2323e5
-DIST pychroot-0.9.18.tar.gz 32879 BLAKE2B 769b3347bae3f7dfb47c0335015cc898ec851a3d45f774a4e21aeaf9b8d7937331bc69aa5bcbb298e76e7e51ffc2e55f049336fd90f6b08fc3bba87089f2205d SHA512 59c8750c9ba8d601eca485079c04d4153bba92531dbd30fba0104694e4435d76e65b762b76ef89a6a6f8908dd6054d1d95fe4be74825ac1c5a56e473370dfa41
-EBUILD pychroot-0.10.0.ebuild 1103 BLAKE2B 3abfa08dc253404e555048e88c3b48bf30c6e332cebbe95605f4b53740ac35794c058d465336edfae0364419d32505958a32fceec355012000517cecb0af5c3b SHA512 29b6f7551ceaccfc18717ac4254088543176c81a2cac94e5d5b08484a257233e4fab0b8507e186f85db9478b55276f1068e86c9f2840f8c310210301b6e2b76b
-EBUILD pychroot-0.9.18.ebuild 1142 BLAKE2B c8f1f4eb6f92378d0efc61c95d6e8e8bcaa1ffebe44db08d30b5552495f34ce84d4ce8e45ffcf753aac2f7cc01d26c763fc5cd829a7b53b65c322ccfc7958838 SHA512 be1db019faca07cefba2d1ef02b03792383ecd53ff9d1ced5e79151809bc6a60c258933718978b44f810cdde254be82d4c95c3c4b12e58249f05c3f9020326e3
-EBUILD pychroot-9999.ebuild 1103 BLAKE2B 3abfa08dc253404e555048e88c3b48bf30c6e332cebbe95605f4b53740ac35794c058d465336edfae0364419d32505958a32fceec355012000517cecb0af5c3b SHA512 29b6f7551ceaccfc18717ac4254088543176c81a2cac94e5d5b08484a257233e4fab0b8507e186f85db9478b55276f1068e86c9f2840f8c310210301b6e2b76b
+DIST pychroot-0.10.1.tar.gz 22169 BLAKE2B 7c39438addfbf9d307ebc751585c8add24712b0a3917986dd76478932389c39b8fbc6238cb21e4c1d13fee08f9478365911e766b676176fe209b4341c551267a SHA512 4df7f405872b693bf9ecac331927f749653b7251a49eaa10c423357f3150bbcbea73052ec4363a0f510aaeecd6b467d985402a8f764e99e67f5882e6b2ea4f97
+EBUILD pychroot-0.10.1.ebuild 981 BLAKE2B 63cfd7a32fef001fb2556f8b571c30ce655817e14cfb0ae6726250fbb0fb9b0d956175ae24513353243c1abeab3a3040c4c5699806731c8b464f3bafca9aa882 SHA512 1e25aa285a5c9396810f4b3f3bd3046ada321fea427ec5cd31ab3bbae0839c114d7830ac44f161658f9339845963a70411f0054ca3126dac1240dfabe8fd1dd2
+EBUILD pychroot-9999.ebuild 981 BLAKE2B 63cfd7a32fef001fb2556f8b571c30ce655817e14cfb0ae6726250fbb0fb9b0d956175ae24513353243c1abeab3a3040c4c5699806731c8b464f3bafca9aa882 SHA512 1e25aa285a5c9396810f4b3f3bd3046ada321fea427ec5cd31ab3bbae0839c114d7830ac44f161658f9339845963a70411f0054ca3126dac1240dfabe8fd1dd2
 MISC metadata.xml 337 BLAKE2B 3c60605dbe9296fe7f6c285123fa649b47c4997af6f715cefcb5047817ddff55f15c4813c2c33dcffa4e771ab3d0afb83bd88506d915e313b237e51ca4729c70 SHA512 4b0da70f35cd4983f6f5cd8aa02e5555b770d3bc2b7e90a8e8287c64593fadf1fe532cef6becce24de96766f94d24d8ec731ac3acff6f42a2c7b06c3e1e1e4d0
diff --git a/dev-python/pychroot/pychroot-0.10.0.ebuild b/dev-python/pychroot/pychroot-0.10.1.ebuild
index e1419b49ab2e..218709a73ba5 100644
--- a/dev-python/pychroot/pychroot-0.10.0.ebuild
+++ b/dev-python/pychroot/pychroot-0.10.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
@@ -24,18 +24,14 @@ RESTRICT="!test? ( test )"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND=">=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]"
+	RDEPEND=">=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]"
 fi
 
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	esetup.py build_man
-}
 
 python_test() {
 	esetup.py test
@@ -43,6 +39,6 @@ python_test() {
 
 python_install_all() {
 	local DOCS=( NEWS.rst README.rst )
-	esetup.py install_man --mandir="${ED}/usr/share/man"
+	[[ ${PV} == *9999 ]] || doman man/*
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pychroot/pychroot-0.9.18.ebuild b/dev-python/pychroot/pychroot-0.9.18.ebuild
deleted file mode 100644
index 465cf543b277..000000000000
--- a/dev-python/pychroot/pychroot-0.9.18.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pychroot.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a python library and cli tool that simplify chroot handling"
-HOMEPAGE="https://github.com/pkgcore/pychroot"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="=dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND=">=dev-python/snakeoil-0.7.4[${PYTHON_USEDEP}]"
-fi
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	esetup.py build_man
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst README.rst )
-	distutils-r1_python_install install_man
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index e1419b49ab2e..218709a73ba5 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
@@ -24,18 +24,14 @@ RESTRICT="!test? ( test )"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND=">=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]"
+	RDEPEND=">=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]"
 fi
 
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	esetup.py build_man
-}
 
 python_test() {
 	esetup.py test
@@ -43,6 +39,6 @@ python_test() {
 
 python_install_all() {
 	local DOCS=( NEWS.rst README.rst )
-	esetup.py install_man --mandir="${ED}/usr/share/man"
+	[[ ${PV} == *9999 ]] || doman man/*
 	distutils-r1_python_install_all
 }