gentoo resync : 06.04.2022

3 files changed, 61 insertions, 43 deletions

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 637031c22240..126eeef91d50 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,7 +1,7 @@
-DIST pypy3.8-gentoo-patches-7.3.7.tar.xz 4396 BLAKE2B adc33a02ada4d22eae0484292ec6cc295805d9f254b7a9110c622628aa40011621a1833ca62d3251e4e5056c406f648e7ad0439bd60e77c38808dd9df46973a5 SHA512 1cda8467de2d749d98fa20d7d200b5f96dae0ca68cf44a054d03f3f148bc3946ba1f1c474ac0336560f79c78b3eddcd4ba24386e83de283c83475b8e4b75bdf8
-DIST pypy3.8-v7.3.7-src.tar.bz2 24375444 BLAKE2B 44fe19ee63d95243c499ecb0b84e77873c73da93320b1e028a5c6c4b167441d223812dc66b16e070308cba48c4d8774738f827319cce9d1769b3f4346e15487c SHA512 9e6701cc441d5535968656cfb0cfa9076c364f9ba32bc6f0ef64f06ab343281e2458dbe88791c0e02401457fbf80d367f397fc904f6146bff68e04a15e05fda2
 DIST pypy3.9-gentoo-patches-7.3.8.tar.xz 1568 BLAKE2B 0011188de7b5757964bd13c49d5995a656a721acd54e1d77f7e77fac7420a2a56ca75eb42709e2304a771fa69c982fc6901e9fc9580ab8e8b35e7bb8b0cc83a6 SHA512 1064e987b7233fc55f94bd49aeeab9a9fd9322e90798439ad9a4c35020ca923fe0670e47406ab180a6f8e7afd65d03be23427d4fa43befa3c0ce172028e1a09f
+DIST pypy3.9-gentoo-patches-7.3.9.tar.xz 1564 BLAKE2B fe0875ef002842a78fb31589f6d0b255c3dea10f2bd014231ae9b17641f65f810ac84fe7961de1a4614249b0166f2127c3aa37947f7d1d4c85860a31b89110f1 SHA512 a1dc3ee36e908e29b2bbbb100a97b7910bd4325c5dc55c0455cdca450d6b272d1463708b383e0607e9499b1932da4442f97d2da57e47ed3a4ff8fd3c78a54732
 DIST pypy3.9-v7.3.8-src.tar.bz2 26277823 BLAKE2B 343fa4a57b69936a586acb036506e25c8de3a9761eb6622ef7266c136a1dc977cabc23969917bc2369fd73b1ae6fef731d81536179107f2d731352e6f5387bf9 SHA512 aed018738af7a225f516ec37d059d539f486d9dd427fe000805147b197f496d5fcb0387e47008524753ad18224aebeb1e68f9e2093acbe37468e02bff92f7126
-EBUILD pypy3-7.3.7-r1.ebuild 5332 BLAKE2B a096f5cbe2cd11561e1f8d8e06a4d4c1d426f09a7498b254a2826053d5d10c4ba69ed8f5eb94931a08559e3f3612a65375adb28006d063664c4865558d8364f0 SHA512 38e7bda1dbbf4e91b5b787c988b9bc8f08a38a3a49bc2af83c9e4f0571705bd34d3b201f2b2e3f8f7be351146b68aae10c40f104a3fe0f4d1da5cc3313629406
-EBUILD pypy3-7.3.8.ebuild 5388 BLAKE2B 15a7511b60b18b122f530e6fe65afacf9e00ae31a0c0e99d2f3dc8fd503eb4d887942ce9afeb1147f74cab0c09dbb05bf53f4258e1b2aedb22aa7c70ed4c7e0d SHA512 943d90bf38aa99682cf68eb555597eff89fbceeea357bf10048ae2f764fbb739b264f5729a61ee170d90f68932ae0c47231395de12edcece789d2f22f5831b64
+DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
+EBUILD pypy3-7.3.8.ebuild 5386 BLAKE2B 45baf647e79ec118eca81b5e4d77c90ead85905173a0e3f1e4f8855382103999afbca328e852680f2242dcaa85f71fe2ffe159a5b0a18fb83ac68324e1681e00 SHA512 e819d64bc18863463e64c55bbe7f6363fbc7c8cb18b79f08877f2729103270cea9972e4673c970659b9fea48c258ba499c6f9e61d715dc101c7fb4f51d3eb775
+EBUILD pypy3-7.3.9.ebuild 5461 BLAKE2B 4086916df9196af0dfbc8cf9e2ca0bd4cd6d4d7b927d4d157abae2ff7f7460492d3c30ba4525d1140e4eee8f7f87067bcf6981a0982936cc3f60cd49f332e2fd SHA512 3a24f51744b66a511152a0c52c4d5bb4a41330e452b6d6d67abe87e74a6ffdc8eeb989b8657226c41bd18cdb600eca7ab924cd16839c0e0e6ac49db6a2e8ba9d
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3/pypy3-7.3.8.ebuild b/dev-python/pypy3/pypy3-7.3.8.ebuild
index 1882ac559133..11b0caeedc1d 100644
--- a/dev-python/pypy3/pypy3-7.3.8.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.8.ebuild
@@ -20,7 +20,7 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy39-pp73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
 # many tests are failing upstream
 # see https://buildbot.pypy.org/summary?branch=py3.9
diff --git a/dev-python/pypy3/pypy3-7.3.7-r1.ebuild b/dev-python/pypy3/pypy3-7.3.9.ebuild
index ccc3af660ca2..536c3974f232 100644
--- a/dev-python/pypy3/pypy3-7.3.7-r1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.9.ebuild
@@ -1,34 +1,37 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python2_7 )
 inherit pax-utils python-any-r1 toolchain-funcs
 
 PYPY_PV=${PV%_p*}
-MY_P=pypy3.8-v${PYPY_PV/_rc/rc}
-PATCHSET="pypy3.8-gentoo-patches-${PV/_rc/rc}"
+MY_P=pypy3.9-v${PYPY_PV/_rc/rc}
+PATCHSET="pypy3.9-gentoo-patches-${PV/_rc/rc}"
 
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.8) language"
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.9) language"
 HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy38-pp73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+SLOT="0/pypy39-pp73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
-# pypy3.8 is in alpha state and many tests are failing
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py3.9
 RESTRICT="test"
 
 RDEPEND="
 	|| (
-		>=dev-python/pypy3-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
-		>=dev-python/pypy3-exe-bin-${PYPY_PV}:${PYPY_PV}
+		>=dev-python/pypy3-exe-${PYPY_PV}:3.9-${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PYPY_PV}:3.9-${PYPY_PV}
 	)
 	dev-lang/python-exec[python_targets_pypy3(-)]
 	dev-libs/openssl:0=
@@ -38,12 +41,15 @@ RDEPEND="
 		dev-lang/tk:0=
 		dev-tcltk/tix:0=
 	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
+	!<dev-python/pypy3-bin-7.3.0:0
+"
+DEPEND="
+	${RDEPEND}
 	test? (
 		${PYTHON_DEPS}
 		!!dev-python/pytest-forked
-	)"
+	)
+"
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
@@ -65,26 +71,33 @@ src_configure() {
 src_compile() {
 	mkdir bin || die
 	# switch to the layout expected for cffi module builds
-	mkdir include/pypy3.8 || die
-	cp include/*.h include/pypy3.8/ || die
+	mkdir include/pypy3.9 || die
 	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy3-c-${PYPY_PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/include/pypy3.8/${PYPY_PV}/* include/pypy3.8/ || die
+	cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die
+	cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die
 	# (not installed by pypy-exe)
 	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy3.8/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy3.8/ || die
-	pax-mark m pypy3-c
+	mv pypy/module/cpyext/include/* include/pypy3.9/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die
+	pax-mark m pypy3.9-c
 
 	# verify the subslot
-	local soabi=$(./pypy3-c -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))')
+	local soabi=$(
+		./pypy3.9-c - <<-EOF
+			import sysconfig
+			print(sysconfig.get_config_var("SOABI"))
+		EOF
+	)
 	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
 
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
+	./pypy3.9-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
 
 	# Generate cffi modules
 	# Please keep in sync with pypy/tool/build_cffi_imports.py!
@@ -103,15 +116,19 @@ src_compile() {
 	cd lib_pypy || die
 	for t in "${cffi_targets[@]}"; do
 		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+		../pypy3.9-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
 	done
 
 	# Verify that CFFI module list is up-to-date
 	local expected_cksum=63d4659f
-	local local_cksum=$(../pypy3-c -c '
-from pypy_tools.build_cffi_imports import cffi_build_scripts as x;
-import binascii, json;
-print("%08x" % (binascii.crc32(json.dumps(x).encode()),))')
+	local local_cksum=$(
+		../pypy3.9-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
 	if [[ ${local_cksum} != ${expected_cksum} ]]; then
 		die "Please verify cffi_targets and update checksum to ${local_cksum}"
 	fi
@@ -129,28 +146,29 @@ src_test() {
 	# Test runner requires Python 2 too. However, it spawns PyPy3
 	# internally so that we end up testing the correct interpreter.
 	# (--deselect for failing doctests)
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3.9-c -vv lib-python || die
 }
 
 src_install() {
 	einfo "Installing PyPy ..."
 	dodir /usr/bin
-	dosym pypy3-c-${PYPY_PV} /usr/bin/pypy3
-	insinto /usr/lib/pypy3.8
+	dosym pypy3.9-c-${PYPY_PV} /usr/bin/pypy3.9
+	dosym pypy3.9 /usr/bin/pypy3
+	insinto /usr/lib/pypy3.9
 	# preserve mtimes to avoid obsoleting caches
 	insopts -p
 	doins -r lib-python/3/. lib_pypy/.
 	insinto /usr/include
-	doins -r include/pypy3.8
+	doins -r include/pypy3.9
 
 	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy3.8/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.8/${x##*/}"
+	for x in "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.9/${x##*/}"
 	done
 
 	dodoc README.rst
 
-	local dest=/usr/lib/pypy3.8
+	local dest=/usr/lib/pypy3.9
 	if ! use gdbm; then
 		rm -r "${ED}${dest}"/_gdbm* || die
 	fi
@@ -166,9 +184,9 @@ src_install() {
 	fi
 
 	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}/usr/bin/pypy3-c-${PYPY_PV}
+	local -x PYTHON=${ED}/usr/bin/pypy3.9-c-${PYPY_PV}
 	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+	cp -p "${BROOT}/usr/bin/pypy3.9-c-${PYPY_PV}" "${PYTHON}" || die
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_moduleinto "${dest}"/site-packages