From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 29 Jun 2020 11:38:31 +0100
Subject: gentoo resync : 29.06.2020

---
 dev-python/speaklater/Manifest                 |  2 +-
 dev-python/speaklater/speaklater-1.3-r1.ebuild | 24 +++++++++---------------
 2 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'dev-python/speaklater')

diff --git a/dev-python/speaklater/Manifest b/dev-python/speaklater/Manifest
index d4b0d7f1b74c..3f4ed56da918 100644
--- a/dev-python/speaklater/Manifest
+++ b/dev-python/speaklater/Manifest
@@ -1,3 +1,3 @@
 DIST speaklater-1.3.tar.gz 3582 BLAKE2B cddf87583670ae185336b73631b28da3dc26b74b75df82224da23df6c528ee074ca31c95d5fbe2971eb87c50480be022493164de62f02f1987a5768d7ae69092 SHA512 ae137d94c497cd4214e230c8906f3ba40e092f248206d37b61de2571567e39e27b7f58bcf2145bd0c81c195c3c5ed03fc0428e0a50c657c5c909ec82719454ef
-EBUILD speaklater-1.3-r1.ebuild 821 BLAKE2B b1d043a19c77fa2a83ca852a06341a984cb5a7d3a837390694f67de90fa63cb04bdf9f680d88f888d8285fe12a00f5c9c4f17cfe9cfa26f76f51220a6d399faa SHA512 17709526c612947e0167a0d219cc2cf5def90e791f6db501507c9df8b16e78d17d0c3a1e33ff743cecb93c01da6209c97c464b65bc8279d8a37b308fdef29bb9
+EBUILD speaklater-1.3-r1.ebuild 689 BLAKE2B 35730ac4cf779f8d40ac2480318dbf06472b2a74d47383e4bfe84acab4db838a66ece113485298092846e7b6cd6fb3b8a4f9f04b8f3d3a37ece03408fc971c20 SHA512 54961b04f239d7b73f0c695487be56f29b2de6efcfadc206860d1924c0bcc9fd954393aac5544c81bf3d94405e21a09b80e93c97b81e5a004e7aaec2869514d5
 MISC metadata.xml 455 BLAKE2B 6270f4ecfb1f4a889daa446a01a3c135190af3d595231e410ec5040e4b869b52c210fdc33df13174566ed720130ad27523b0734baf578527412e25420eae8140 SHA512 8108151c4b3dec1c435e76c7caea98d68913812d32ae75cc72d000fbe90d20ad726dbbaa1186ea1443d1c4323785bab06006a4bb3176684fea6e534ab3d21e91
diff --git a/dev-python/speaklater/speaklater-1.3-r1.ebuild b/dev-python/speaklater/speaklater-1.3-r1.ebuild
index 2be303dcc63a..d7bee32595a3 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=( python{3_6,3_7,3_8} pypy )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Lazy strings for Python"
@@ -13,22 +13,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-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() {
-	"${PYTHON}" -m doctest -v ${PN}.py || die "tests failed with ${EPYTHON}"
+	"${EPYTHON}" -m doctest -v speaklater.py ||
+		die "tests failed with ${EPYTHON}"
 }
-- 
cgit v1.2.3