gentoo auto-resync : 25:11:2022 - 01:11:36

7 files changed, 43 insertions, 83 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 901d50898860..00329716e4df 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 0637fb8fdb5e..7fe192da559b 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -2,6 +2,6 @@ DIST pypy2.7-gentoo-patches-7.3.10rc3.tar.xz 5324 BLAKE2B 83675b7d2aa0eaace33730
 DIST pypy2.7-gentoo-patches-7.3.9_p1.tar.xz 7832 BLAKE2B d04fc46ab9dc8b212ed3783c1ce49d72f96dfde754da67cc97ea0c193e7ad7f5f8fdd68561b93ef0b22dde86ec3f848ee8ec8a3d78d925b6d96abd2d88d34c14 SHA512 b9d2ccccab34a5027f68e1429ff6862a0172cf8cc9eaef5e4eaa3eb091d9c2751701dbe1f61481fd84d08cb3d5bafb40a5c753906c17dc2a57bfc28acd673e1a
 DIST pypy2.7-v7.3.10rc3-src.tar.bz2 19776339 BLAKE2B a6866a0ff7a7b4bb3e1815fdc741cc95ff7945f6271e0189b6d16d1efc64c72a75a1400c3859a5b8c5f5b176217463a446b3449093572df59e13df15a207828f SHA512 097d57862728197e648cf38380ce4a60d6192bc9f2c0c2cf6840717af0320acd8cf42e344513428be60f60e136d830a0bb5d6295e7909cd7f3a42bac992c780a
 DIST pypy2.7-v7.3.9-src.tar.bz2 23328628 BLAKE2B 50d015439b6a6f15dd24eb4524726a2054f0d8e7ef209b54dc4eb9365b41b333f3dad525422316af3ff19e6ffb5866859db4455e05fc1529a81ce3b6e7c621db SHA512 8d7513d4efe924f2456dd65a45a82dd16171f7962c81ba90f2a168c332cdad78ceffa3ed1af379c09e61082b39d5c2a8385cd77c89b698c47cc75e9df1bb4d2a
-EBUILD pypy-exe-7.3.10_rc3.ebuild 4267 BLAKE2B 7ac8a62309e49b4cdb7e8e63df2f561a162e821afefb29e0ce3a8389b2bceaac8630c36e603900f98fc3c32fbcf1fb22df04635ce1822b2fbd93ea23b24a02b8 SHA512 b495f6771e909358e30efc1d2dc686f08ed0163493cd231a99cd91471d1c94c820915f6197fe60317846c382e44fc080b829fccaa15138c2fd0fa32a328ecef0
+EBUILD pypy-exe-7.3.10_rc3.ebuild 4013 BLAKE2B 2a9d85d52eb27a3f580d59451ecccc2fa8e341bfd27b8a38d6e138082e916ad994c5b0e7acf3bde679697d78735ba1b971bcfa69bac891180f46e7befe1751ba SHA512 f5087eec35a09ed46f3f5a427741d7a0635b30750a77ac8c1f47ca268812e8f765c5fcfce67e90279b356fd9cb0008de4b1b599ad1436268fc515074f5ec3516
 EBUILD pypy-exe-7.3.9.ebuild 4317 BLAKE2B ac746e40592066d98eef14f51360fda83e94395feeb2681fa833dfd9136d9e526d9939c1448f59674e1eb744bd95e19215199fcfdc7095f9419ec5dda832981b SHA512 78d8dd56fb7722f3e5bde06e5c2e9079198258912c1657d7bee0e2f013ca4963018b8978c0faeb2a674ea3c743b82d1aa2dcae39b76ee6737bf1545023d282cd
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.10_rc3.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.10_rc3.ebuild
index e5db7a520127..f759cbcf5a4a 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.10_rc3.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.10_rc3.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python2_7 )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+inherit check-reqs pax-utils toolchain-funcs
 
 PYPY_PV=${PV%_p*}
 MY_P=pypy2.7-v${PYPY_PV/_}
@@ -23,20 +22,20 @@ SLOT="${PYPY_PV}"
 KEYWORDS=""
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
-RDEPEND="
+DEPEND="
 	>=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/pypy-exe-bin:${PYPY_PV}
 "
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="
-	${RDEPEND}
+RDEPEND="
+	${DEPEND}
+	!dev-python/pypy-exe-bin:${PYPY_PV}
 "
+# don't enforce the dep on dev-python/pypy with USE=low-memory
+# since it's going to cause circular dep with unhelpful error message
 BDEPEND="
 	!low-memory? (
 		|| (
@@ -47,19 +46,23 @@ BDEPEND="
 "
 
 check_env() {
-	if use low-memory; then
-		if ! has_version -b dev-python/pypy &&
-				! has_version -b dev-python/pypy-bin
-		then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+	if ! has_version -b dev-python/pypy; then
+		if use low-memory; then
+			eerror "USE=low-memory requires (a prior version of) dev-python/pypy"
+			eerror "installed."
+		else
+			ewarn "CPython 2.7 will be used to perform the translation.  Upstream"
+			ewarn "recommends using (a prior version of) dev-python/pypy instead."
+		fi
+		elog "You can install a prebuilt version of PyPy first using e.g.:"
+		elog "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+
+		if use low-memory; then
 			die "dev-python/pypy needs to be installed for USE=low-memory"
 		fi
+	fi
 
+	if use low-memory; then
 		CHECKREQS_MEMORY="1750M"
 		use amd64 && CHECKREQS_MEMORY="3500M"
 	else
@@ -75,23 +78,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using already-installed PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-			python-any-r1_pkg_setup
-		fi
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && check_env
 }
 
 src_prepare() {
@@ -149,13 +136,18 @@ src_configure() {
 		)
 	done
 
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
+	local interp
+	if use low-memory || has_version -b dev-python/pypy; then
+		einfo "Using already-installed PyPy to perform the translation."
+		interp=( pypy )
+		if use low-memory; then
+			local -x PYPY_GC_MAX_DELTA=200MB
+			interp+=( --jit loop_longevity=300 )
+		fi
+	else
+		einfo "Using CPython 2.7 to perform the translation."
+		interp=( python2.7 )
 
-	if [[ ${EPYTHON} != pypy ]]; then
 		# reuse bundled pycparser to avoid external dep
 		mkdir -p "${T}"/pymod/cffi || die
 		: > "${T}"/pymod/cffi/__init__.py || die
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index ca9d06ecb693..f3198aba5647 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -2,6 +2,6 @@ DIST pypy3.9-gentoo-patches-7.3.10rc3.tar.xz 8712 BLAKE2B 65c5461b4830cd8ee29512
 DIST pypy3.9-gentoo-patches-7.3.9_p6.tar.xz 13740 BLAKE2B 0200eb697f4efb0ee47f7ba053f5d8fe45cad317a665637cad8a429327f084e1d4366c44ead4eeb0c4ead1e3d284bee39b1f3b9665de5882004ca8b0f0b90a64 SHA512 961b79074fc1c37e13b8a6cd370b716103fbc942163e2030475317d966c3bedf73876b23751da82dbd759324ff64e06348a167a1ef84adb4b444b2ff1a5b742e
 DIST pypy3.9-v7.3.10rc3-src.tar.bz2 23453446 BLAKE2B eefedc5d49602f19c9d39f20f060ddb4f00bd49681fee64fa98a7c7a3856df7f4ae4e17e51a3fa37137d049b463855ce7e2c95abd9878665b66fc9b90a91ec6c SHA512 d831c8c716f40514e54845ec7ab6b3ecf1af74bc66504196dda251d66feff4e206c77535484ef1747dc390db2bdc2be38e9be3401831b321ea043016e42c2a27
 DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
-EBUILD pypy3-exe-7.3.10_rc3.ebuild 3533 BLAKE2B b46b781ffffa86a6c3802533489154f0599ac204dfa64908a5dd6c763a407572c080ba072165481cd87dbb34042995665d4996baf65bbacc71e129411ff90e13 SHA512 7f88f21375aeb4189b2d40def0183adbd90727b9cd45a45e54f5384e766ac2015654567b451ba20d837cde40281e212aa12e5f4e2152fff1f3cf0d71e86fdbb5
+EBUILD pypy3-exe-7.3.10_rc3.ebuild 2548 BLAKE2B c4d3f4739e11e940b1c04a803f96e66aa08e50949a0144149e6fa8bafc0f4f4242030d5da0276677261a1fa52cec36191368c6c5da863e204ae64ec567b0bd69 SHA512 f0a23c3aa75b7d4aafb5347240189a5b7c5dd168ae2d35a747f97ae42b7bf98930e278ce43feffb1fa473a20a48a3880585fcfbcd9e984f5afc598625e96740f
 EBUILD pypy3-exe-7.3.9_p3.ebuild 3586 BLAKE2B 6b9920e9197e2926e88c38244bf2a1280ec9492cc08317a109c3143e94e85c230599d31d795e8ea0b05a0be3fcaaaf6cb00b2a1282603e113f019f7ffbe72188 SHA512 d271c300a8af93854a396eb1ecc1c390887dc597a6956512ea77759a7abdad4245530d11ffb434d5511cd81319b18e301fc8c29399afc253b189192950f36a2c
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild
index 805ec9fcf901..6df29312cc6a 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.10_rc3.ebuild
@@ -3,9 +3,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
+inherit check-reqs pax-utils toolchain-funcs
 
 PYPY_PV=${PV%_p*}
 MY_P=pypy3.9-v${PYPY_PV/_}
@@ -37,13 +35,7 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	low-memory? ( dev-python/pypy )
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)
+	dev-python/pypy
 "
 
 check_env() {
@@ -63,24 +55,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
-			python-any-r1_pkg_setup
-		fi
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && check_env
 }
 
 src_prepare() {
@@ -124,17 +99,10 @@ src_configure() {
 		$(usex ncurses --with{,out}mod-_minimal_curses)
 	)
 
-	local interp=( "${EPYTHON}" )
+	local interp=( pypy )
 	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/pycparser || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+		local -x PYPY_GC_MAX_DELTA=200MB
+		interp+=( --jit loop_longevity=300 )
 	fi
 
 	# translate into the C sources
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 842d82d7a8eb..ab2be3a7150d 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -6,5 +6,5 @@ DIST sip-6.7.5.tar.gz 1160691 BLAKE2B 64572687e026854c3e8ba7de637925f13a880e51e5
 EBUILD sip-4.19.25-r1.ebuild 2275 BLAKE2B 89ea240194120bff7b9b3d9b2026f2343fde3bbd8063bb2070ca12c624db79e4d2582a9024cc011705a8f3dd78468ba3849dfd9f806706a20cd1d3c3c0f21b79 SHA512 9cfcd1c771a10205695e66316168e3b29cf4b2fe48212b6918152b988571ce944ee86c6b55f3d9531e7a624a1c7554beff403d76addc6645e4f92e73fb904439
 EBUILD sip-6.6.2.ebuild 974 BLAKE2B d7564afafdb4f1cbcd44209f6b5f9da41654a5d80f976ccd2bdbd12a09b1c3804913acc21583e54646b114f35a0173cddb9baf5f7ac3905036cac35c07ba1ec8 SHA512 cbd6b0ca1e1123e61934bdc0cf44003e63532570767807358031aa7d6412ef4452177ad375d103a26cc57a64947f5bf017f1f62f3c7e04cef1e06d4ae6484ae6
 EBUILD sip-6.7.4.ebuild 980 BLAKE2B 86d0d907cdd9704fff7c81f2a8b5ae69cc79399bde6716951c6036758cdf0dbf3d71ccd40dc3033191dae70bbe9da8b4d4b836abb583cd9645e259ce0f9ff14f SHA512 6d39a2684b673a717476478cbafea54921bc0817ce32b2b303633ff483f19f8d905837c8754358e8c8e674e1e444a99dc7313f83e3d5753910c22001a6132390
-EBUILD sip-6.7.5.ebuild 977 BLAKE2B 754cefe8bf0c209a50bf9ad633986cacfc1e5d4de7d34d207849d2d67efd2328722346b71299954436e53b5b5b8da4829ba1cf38f5f39fdd67dd59649b7006c6 SHA512 9e4666587af77408afd8b3df087d565a1cbfa191b84da5ca22513d5a274469512ec92a0dbcf6a06e15ed5ad5c57bbebe4dea423cf25e30d850fa04a5a13e2a78
+EBUILD sip-6.7.5.ebuild 974 BLAKE2B d7564afafdb4f1cbcd44209f6b5f9da41654a5d80f976ccd2bdbd12a09b1c3804913acc21583e54646b114f35a0173cddb9baf5f7ac3905036cac35c07ba1ec8 SHA512 cbd6b0ca1e1123e61934bdc0cf44003e63532570767807358031aa7d6412ef4452177ad375d103a26cc57a64947f5bf017f1f62f3c7e04cef1e06d4ae6484ae6
 MISC metadata.xml 639 BLAKE2B deb4a3e534eaa966db932dc17bf7df6a04ed41ce707dc7f1befb272c362be06f222f976c4b0d526a6190d4954f1fa0e2c94ccc2e6cfceff6e8db5959e653fed1 SHA512 8c8e45d32587e346d4df067950aacbc767618418d42f4a5bf48a62706c9612007915ec643dc9fe7b7d083696b26795abb76d9cc475481c26782874f5116863a1
diff --git a/dev-python/sip/sip-6.7.5.ebuild b/dev-python/sip/sip-6.7.5.ebuild
index e439aac3a288..0633666aa3de 100644
--- a/dev-python/sip/sip-6.7.5.ebuild
+++ b/dev-python/sip/sip-6.7.5.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="5"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]