gentoo resync : 06.04.2022

3 files changed, 31 insertions, 25 deletions

diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index bca60559b28f..655bdd5951ea 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/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-exe-7.3.7.ebuild 3832 BLAKE2B 764497f707495532cce107edc6b8713848bed0ca751715032d15bee05b19ebce42ff6f2d8fd27a5435a18f903bdb1e833245202e642330dd67f5b674901add50 SHA512 696560eae5755631ba98f876095e7e7451a4fe5c52a28117cf6310c57344359089dbab1854e789a20683e0068585874bfd11f4b223be8360a000b51a4e9cc56e
-EBUILD pypy3-exe-7.3.8.ebuild 3795 BLAKE2B 1ff1411d1faed6811e58bae134b50793665be8ffd8e39e256f4b154f033673cb7e0fc3c1943d5ef1bb84217b4e832c2a90a9c387dd8bf723bde04f8e70125d87 SHA512 76721248dc75e7db421f4a3f1c4a5b0639d1ed557e2654171d17200b7dbca8dfd34606b9ce9dfa238fde1400284a2c42eec92a87d450de9a60f173be5768a017
+DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
+EBUILD pypy3-exe-7.3.8.ebuild 3790 BLAKE2B 58e5d01860e5f9b540df21627c84bf8c7c77e707f3480cf9b0a71b76b799365d82eddc6ae8235d83d2cef4c1f4792ef6fa6a06b40cb9587828897a5b7997df6e SHA512 1e15d3deaa345a12102cebc2f46eb0c8ac0e4260f621fabd3cd53ad2674ca3aca34a84f8867c8e33bb012b7914a8558c71b4edf3fa6c196ec74f25d87805a517
+EBUILD pypy3-exe-7.3.9.ebuild 3802 BLAKE2B 52eb6b7fbc7cc08dadb668d133a70eb92e9e882029b6a4a6dc95747637016ede113e34ad5c24a0b8487eeffbd280b3d012946dbde5a4f212b48f0345f0a49218 SHA512 624842844d2dd444c611d03eeed8932f4462bcd205641f697ee9f5884e3cf71b3cd80d4e6eecb0948b02dc20a2e33118f440ee95681bffadc3d2b8fe3b6116f6
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.8.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.8.ebuild
index 259314b5d362..e7aa12b834f3 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.8.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.8.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="3.9-${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
@@ -28,7 +28,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	dev-libs/expat:0=
 	bzip2? ( app-arch/bzip2:0= )
 	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PYPY_PV}"
+	!dev-python/pypy3-exe-bin:${SLOT}"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	low-memory? ( dev-python/pypy )
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.7.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.9.ebuild
index deff4b1a5c6c..9a7da2c99e68 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.7.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.9.ebuild
@@ -1,35 +1,41 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # pypy3 needs to be built using python 2
 PYTHON_COMPAT=( python2_7 )
 inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 
 PYPY_PV=${PV%_p*}
-MY_P=pypy3.8-v${PYPY_PV/_}
-PATCHSET="pypy3.8-gentoo-patches-${PV/_}"
+MY_P=pypy3.9-v${PYPY_PV/_}
+PATCHSET="pypy3.9-gentoo-patches-${PV/_}"
 
 DESCRIPTION="PyPy3 executable (build from source)"
 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"
-SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+SLOT="3.9-${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
+RDEPEND="
+	>=sys-libs/zlib-1.1.3:0=
 	dev-libs/libffi:0=
 	virtual/libintl:0=
 	dev-libs/expat:0=
 	bzip2? ( app-arch/bzip2:0= )
 	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PYPY_PV}"
-DEPEND="${RDEPEND}"
+	!dev-python/pypy3-exe-bin:${SLOT}
+"
+DEPEND="
+	${RDEPEND}
+"
 BDEPEND="
 	low-memory? ( dev-python/pypy )
 	!low-memory? (
@@ -37,7 +43,8 @@ BDEPEND="
 			dev-python/pypy
 			dev-lang/python:2.7
 		)
-	)"
+	)
+"
 
 check_env() {
 	if use low-memory; then
@@ -139,9 +146,8 @@ src_configure() {
 
 	if [[ ${EPYTHON} != pypy ]]; then
 		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		mkdir -p "${T}"/pymod || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/pycparser || die
 		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
 	fi
 
@@ -159,8 +165,8 @@ src_compile() {
 
 src_install() {
 	cd "${T}"/usession*-0 || die
-	newbin testing_1/pypy3-c pypy3-c-${PYPY_PV}
-	insinto /usr/include/pypy3.8/${PYPY_PV}
-	doins pypy_*.h
-	pax-mark m "${ED}/usr/bin/pypy3-c-${PYPY_PV}"
+	newbin testing_1/pypy3.9-c pypy3.9-c-${PYPY_PV}
+	insinto /usr/include/pypy3.9/${PYPY_PV}
+	doins *.h
+	pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}"
 }