[gentoo-commits] repo/gentoo:master commit in: dev-python/pylibmc/

[Michał Górny]

commit:     7217e9d4a5f968cf5d1d0d7084b1d350c466eb4b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 11:12:34 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 11:18:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7217e9d4

dev-python/pylibmc: Port to py3.9

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild | 45 +++++++++++-------------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild 
b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index 42727e34ff9..2a0821dc14f 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -15,35 +15,24 @@ 
SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-IUSE="doc test"
-
-# implementations to use for building docs, separate from PYTHON_COMPAT since
-# dev-python/sphinx might not be available everywhere
-DOCS_PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/libmemcached-0.32"
 # Older sphinx versions fail to compile the doc
 # https://github.com/sphinx-doc/sphinx/issues/3266
-BDEPEND="${RDEPEND}
-       doc? ( $(python_gen_cond_dep '
-               >=dev-python/sphinx-1.5.1-r1[${PYTHON_USEDEP}]' 
"${DOCS_PYTHON_COMPAT[@]}")
-       )
+DEPEND="${RDEPEND}"
+BDEPEND="
        test? (
                net-misc/memcached
                dev-python/nose[${PYTHON_USEDEP}]
        )"
 
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags "${DOCS_PYTHON_COMPAT[@]}") ) 
)"
-
 PATCHES=(
        "${FILESDIR}/pylibmc-1.6.1-fix-test-failures-r1.patch"
 )
 
-pkg_setup() {
-       use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( "${DOCS_PYTHON_COMPAT[@]}" )
-}
+distutils_enable_sphinx docs
 
 python_prepare_all() {
        sed -e "/with-info=1/d" -i setup.cfg || die
@@ -51,22 +40,20 @@ python_prepare_all() {
        # some amazon thing, expects to be in AWS
        rm tests/test_autoconf.py || die
        distutils-r1_python_prepare_all
+
+       # needed for docs
+       export PYLIBMC_DIR=.
 }
 
-python_compile_all() {
-       if use doc; then
-               # This variable is added to sys.path
-               # but it does not seem to be useful
-               PYLIBMC_DIR="." emake -C docs
-               HTML_DOCS=( docs/_build/html/. )
-       fi
+src_test() {
+       local -x MEMCACHED_PORT=11219
+       memcached -d -p "${MEMCACHED_PORT}" -u nobody -l localhost \
+               -P "${T}/m.pid" || die
+       distutils-r1_src_test
+       kill "$(<"${T}/m.pid")" || die
 }
 
 python_test() {
        distutils_install_for_testing
-       memcached -d -p 11219 -u nobody -l localhost -P "${T}/m.pid" || die
-       MEMCACHED_PORT=11219 nosetests -v
-       local ret=${?}
-       kill "$(<"${T}/m.pid")" || die
-       [[ ${ret} == 0 ]] || die "Tests fail with ${EPYTHON}!"
+       nosetests -v || die "Tests failed with ${EPYTHON}"
 }