From c0fb36da90c74bd40669ab6c56cb7355dcc78b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 24 Jun 2020 08:03:30 +0200 Subject: [PATCH] dev-python/speaklater: Simplify as py3-only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/speaklater/speaklater-1.3-r1.ebuild | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dev-python/speaklater/speaklater-1.3-r1.ebuild b/dev-python/speaklater/speaklater-1.3-r1.ebuild index 7f01115907725..d7bee32595a39 100644 --- a/dev-python/speaklater/speaklater-1.3-r1.ebuild +++ b/dev-python/speaklater/speaklater-1.3-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_{6..9} pypy ) +PYTHON_COMPAT=( python3_{6..9} ) inherit distutils-r1 DESCRIPTION="Lazy strings for Python" @@ -14,14 +14,12 @@ LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86" -python_prepare() { +python_configure_all() { # https://github.com/mitsuhiko/speaklater/issues/2 - if python_is_python3; then - 2to3 -n -w --no-diffs ${PN}.py || die - 2to3 -d -n -w --no-diffs ${PN}.py || die - # fix unicode in doctests - sed -ri "s/(^ {4}l?)u'/\1'/" ${PN}.py || die - fi + 2to3 -n -w --no-diffs ${PN}.py || die + 2to3 -d -n -w --no-diffs ${PN}.py || die + # fix unicode in doctests + sed -ri "s/(^ {4}l?)u'/\1'/" ${PN}.py || die } python_test() {