public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/
Date: Wed,  7 Dec 2022 13:04:17 +0000 (UTC)	[thread overview]
Message-ID: <1670418251.05a1f25f2ce121549ac19f5ac2bf4a7bdc4233c2.mgorny@gentoo> (raw)

commit:     05a1f25f2ce121549ac19f5ac2bf4a7bdc4233c2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 08:07:14 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 13:04:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a1f25f

dev-python/pypy: Bump to 7.3.10

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pypy/Manifest           |   2 +
 dev-python/pypy/pypy-7.3.10.ebuild | 302 +++++++++++++++++++++++++++++++++++++
 2 files changed, 304 insertions(+)

diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index f549ebbc1601..853c840e83dc 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,6 @@
+DIST pypy2.7-gentoo-patches-7.3.10.tar.xz 5312 BLAKE2B 3ca6d3a01914ae92d93fbd185705dae6bebfd4869a818f4a8058c9df3ea243fd9f1e5b962351f8d07a9679e8020499e81b7d1114d4f1b7493dc1d34c8c04409e SHA512 6758894f6d66dc99a13471cf373c5a2d2bbf37ac561e8d7c4f57ec2f1a9653cf9859547d9a7a80e7f0f7df16078030a4b1cee69536958176f0261da49493310e
 DIST pypy2.7-gentoo-patches-7.3.10rc3.tar.xz 5324 BLAKE2B 83675b7d2aa0eaace337308e9d818e1d745471a72bd67f269265b06b40a2fb62e26aedd2489ceaf02eb15dd655277dcf8fc3fe280d83d636afb0a69eb2b35795 SHA512 7fdf4fc2f7fdd8accd8af6f8713c6db55510be7a129e608ef0a7c30cd8db74f2711ded41daae3d2d698e394a146996cf699d87147a5d433a2321bcb7682c15b7
 DIST pypy2.7-gentoo-patches-7.3.9.tar.xz 7428 BLAKE2B 0a42e3c04ac0e560d56ce7218db81fa55f74ad45a4a033ccda8c5fba34e3a0b1f06587b5b18e947170cc635bd44e5a7799daeec9319c6a09165a73b32554a4b6 SHA512 3a52d40ccf8d77f3493a763b51e4bf86a808f6478191ed4eeaa4f2c2ce8b75769c3880d07cbc7614d8af5573f3e8edfe694be41626b947f3d06c321cf4f59abd
+DIST pypy2.7-v7.3.10-src.tar.bz2 19865458 BLAKE2B 0ba83b873daf99b20bd38ee63734c7ceb47b6a7e9cb4bdab1ebbd5672767411f0bf926a19a7074cbfc154a8d83e3679c98fe38c5b6e00c1a4a3fab5424b5ba5d SHA512 750427ce03fdc39f8b6df528f5a2b17f33429433f583a7c46a6b9564f7e398616ae61efb635a4bc0a1f8916ca1881bf1f6347a7ea1748c09ae02e4d88315986d
 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

diff --git a/dev-python/pypy/pypy-7.3.10.ebuild b/dev-python/pypy/pypy-7.3.10.ebuild
new file mode 100644
index 000000000000..bc21aa76af5e
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.10.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils python-utils-r1
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python 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
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 full-stdlib gdbm +jit ncurses sqlite tk"
+RESTRICT="!full-stdlib? ( test )"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy-c - <<-EOF
+			import sysconfig
+			print sysconfig.get_config_var("SOABI")
+		EOF
+	)
+	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	einfo "Generating caches and CFFI modules ..."
+
+	if use full-stdlib; then
+		# Generate Grammar and PatternGrammar pickles.
+		./pypy-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!
+		cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
+		use gdbm && cffi_targets+=( gdbm )
+		use ncurses && cffi_targets+=( curses )
+		use sqlite && cffi_targets+=( sqlite3 )
+		use tk && cffi_targets+=( tkinter/tklib )
+
+		local t
+		# all modules except tkinter output to .
+		# tkinter outputs to the correct dir ...
+		cd lib_pypy || die
+		for t in "${cffi_targets[@]}"; do
+			# tkinter doesn't work via -m
+			../pypy-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=2d3acf18
+		local local_cksum=$(
+			../pypy-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)),))
+			EOF
+		)
+		if [[ ${local_cksum} != ${expected_cksum} ]]; then
+			die "Please verify cffi_targets and update checksum to ${local_cksum}"
+		fi
+
+		# Cleanup temporary objects
+		find -name "_cffi_*.[co]" -delete || die
+		find -type d -empty -delete || die
+	fi
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+
+		# broken by expat-2.4.5
+		--ignore=lib-python/2.7/test/test_minidom.py
+		--ignore=lib-python/2.7/test/test_xml_etree.py
+		--ignore=lib-python/2.7/test/test_xml_etree_c.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	if use full-stdlib; then
+		doins -r include lib_pypy lib-python
+
+		# replace copied headers with symlinks
+		for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
+			dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+		done
+
+		if ! use gdbm; then
+			rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+				"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+		fi
+		if ! use sqlite; then
+			rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+				"${ED}${dest}"/lib_pypy/_sqlite3.py \
+				"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+		fi
+		if ! use tk; then
+			rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+				"${ED}${dest}"/lib_pypy/_tkinter \
+				"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+		fi
+	else
+		# install only the absolutely minimal subset of modules needed
+		# for pypy3 build
+		local lib_py_modules=(
+			# base modules needed to even start pypy (and import site)
+			codecs.py
+			copy_reg.py
+			encodings
+			genericpath.py
+			linecache.py
+			os.py
+			pkgutil.py
+			posixpath.py
+			re.py
+			runpy.py
+			site.py
+			sre_compile.py
+			sre_constants.py
+			sre_parse.py
+			stat.py
+			string.py
+			sysconfig.py
+			traceback.py
+			warnings.py
+			UserDict.py
+
+			# needed for python_optimize
+			compileall.py
+			getopt.py
+			py_compile.py
+			struct.py
+
+			# needed for rpython
+			argparse.py
+			atexit.py
+			base64.py
+			bdb.py
+			bisect.py
+			cmd.py
+			code.py
+			codeop.py
+			collections.py
+			colorsys.py
+			contextlib.py
+			copy.py
+			ctypes
+			dis.py
+			fnmatch.py
+			functools.py
+			gettext.py
+			hashlib.py
+			heapq.py
+			inspect.py
+			io.py
+			json
+			keyword.py
+			locale.py
+			logging
+			new.py
+			opcode.py
+			optparse.py
+			pdb.py
+			pickle.py
+			platform.py
+			pprint.py
+			random.py
+			repr.py
+			shlex.py
+			shutil.py
+			StringIO.py
+			subprocess.py
+			tempfile.py
+			textwrap.py
+			threading.py
+			tokenize.py
+			weakref.py
+			zipfile.py
+		)
+
+		local distutils_modules=(
+			# needed by site
+			__init__.py
+			errors.py
+			sysconfig.py
+			sysconfig_cpython.py
+			sysconfig_pypy.py
+		)
+
+		local lib_pypy_modules=(
+			# needed by site
+			_sysconfigdata.py
+
+			# needed by rpython
+			cffi
+			_ctypes
+			_ffi.py
+			_functools.py
+			_sha.py
+			_sha256.py
+			_sha512.py
+
+			# NB: we're deliberately skipping _hashlib to avoid some deps
+		)
+
+		cd lib-python/2.7 || die
+		insinto "${dest}/lib-python/2.7"
+		doins -r "${lib_py_modules[@]}"
+		cd - >/dev/null || die
+
+		cd lib-python/2.7/distutils || die
+		insinto "${dest}/lib-python/2.7/distutils"
+		doins -r "${distutils_modules[@]}"
+		cd - >/dev/null || die
+
+		cd lib_pypy || die
+		insinto "${dest}/lib_pypy"
+		doins -r "${lib_pypy_modules[@]}"
+		cd - >/dev/null || die
+	fi
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}


             reply	other threads:[~2022-12-07 13:04 UTC|newest]

Thread overview: 162+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-07 13:04 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-15 15:04 [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/ Michał Górny
2024-09-15 15:04 Michał Górny
2024-08-29 16:29 Michał Górny
2024-04-25  3:39 Michał Górny
2024-04-24 17:59 Arthur Zamarin
2024-04-24 17:16 Sam James
2024-04-24 15:08 Michał Górny
2024-02-04  4:01 Michał Górny
2024-02-03 21:34 Sam James
2024-02-03 19:09 Sam James
2024-02-02 17:23 Michał Górny
2024-02-02 17:17 Michał Górny
2024-02-02 16:39 Michał Górny
2024-02-02 16:27 Arthur Zamarin
2024-02-02 14:21 Michał Górny
2024-02-02 14:17 Arthur Zamarin
2024-01-15 21:24 Michał Górny
2023-12-25 20:26 Michał Górny
2023-12-21  4:16 Michał Górny
2023-11-02 12:58 Michał Górny
2023-09-30  8:27 Michał Górny
2023-07-24 15:05 Michał Górny
2023-07-24 14:43 Arthur Zamarin
2023-07-24 14:25 Arthur Zamarin
2023-06-19  5:14 Michał Górny
2023-06-16 17:03 Michał Górny
2023-05-31  9:19 Michał Górny
2023-05-14 19:29 Michał Górny
2023-02-03 15:22 Michał Górny
2023-02-03 15:17 Michał Górny
2023-02-03 13:46 Arthur Zamarin
2023-02-03 13:46 Arthur Zamarin
2022-12-30 14:32 Michał Górny
2022-12-11 15:46 Michał Górny
2022-12-07 15:59 Michał Górny
2022-12-07 15:42 Sam James
2022-12-07 15:42 Sam James
2022-11-24 16:47 Michał Górny
2022-09-01  6:22 Michał Górny
2022-08-31 20:39 Agostino Sarubbo
2022-08-30 10:15 Michał Górny
2022-08-25 15:30 Michał Górny
2022-08-10 20:31 Michał Górny
2022-05-04 17:56 Michał Górny
2022-05-04 15:11 Jakov Smolić
2022-05-01 12:20 Jakov Smolić
2022-03-30 15:13 Michał Górny
2022-03-22 10:00 Michał Górny
2022-03-22  9:27 Jakov Smolić
2022-03-22  9:27 Jakov Smolić
2022-02-20 14:19 Michał Górny
2022-02-20 14:19 Michał Górny
2022-02-20 14:19 Michał Górny
2022-02-20 14:19 Michał Górny
2022-02-20 12:28 Michał Górny
2022-02-11 12:16 Michał Górny
2021-11-10  8:00 Michał Górny
2021-11-10  7:05 Agostino Sarubbo
2021-11-10  7:04 Agostino Sarubbo
2021-10-25 20:16 Michał Górny
2021-10-17 21:15 Michał Górny
2021-10-06 18:17 Michał Górny
2021-09-14  8:59 Michał Górny
2021-09-13 20:55 Michał Górny
2021-09-03  6:57 Michał Górny
2021-09-03  6:40 Agostino Sarubbo
2021-09-03  6:34 Agostino Sarubbo
2021-08-31  9:05 Michał Górny
2021-08-31  8:43 Michał Górny
2021-08-29 22:22 Michał Górny
2021-07-30 18:14 Michał Górny
2021-07-17 14:04 Mikle Kolyada
2021-07-17 14:03 Mikle Kolyada
2021-06-19 19:18 Michał Górny
2021-06-19 19:18 Michał Górny
2021-05-24 10:22 Michał Górny
2021-05-23 23:05 Agostino Sarubbo
2021-05-19 20:06 Agostino Sarubbo
2021-05-19 18:21 Michał Górny
2021-05-14 22:00 Michał Górny
2021-05-11 10:03 Agostino Sarubbo
2021-05-02  9:21 Mikle Kolyada
2021-05-01 18:19 Agostino Sarubbo
2021-04-12 13:49 Michał Górny
2021-04-09 11:46 Michał Górny
2021-03-05 20:49 Agostino Sarubbo
2021-03-05 20:48 Agostino Sarubbo
2021-03-04 15:04 Michał Górny
2021-03-04 14:56 Michał Górny
2021-03-04  8:57 Michał Górny
2021-03-03 23:11 Michał Górny
2021-01-09  2:14 Sam James
2020-12-31 23:08 Sam James
2020-11-22 11:51 Michał Górny
2020-09-30  2:25 Sam James
2020-09-25 12:13 Michał Górny
2020-09-25 12:13 Michał Górny
2020-09-17 16:56 Michał Górny
2020-09-16 22:30 Michał Górny
2020-09-16 22:30 Michał Górny
2020-09-11 21:05 Michał Górny
2020-09-09  7:18 Michał Górny
2020-08-29 17:57 Thomas Deutschmann
2020-08-27  5:44 Michał Górny
2020-04-12 17:47 Michał Górny
2020-03-25 20:31 Michał Górny
2020-02-08 13:37 Mikle Kolyada
2020-01-27 15:44 Thomas Deutschmann
2020-01-17 18:35 Michał Górny
2020-01-04 23:53 Georgy Yakovlev
2019-12-30 12:12 Michał Górny
2019-12-30 11:59 Michał Górny
2019-12-30 11:59 Michał Górny
2019-12-25 18:38 Michał Górny
2019-12-14 11:58 Michał Górny
2019-11-20 12:27 Michał Górny
2019-11-01  8:07 Michał Górny
2019-10-18 16:24 Michał Górny
2019-04-21  6:29 Michał Górny
2019-03-28 14:22 Michał Górny
2019-02-14 22:07 Michał Górny
2019-02-14 22:07 Michał Górny
2019-01-05 13:39 Michał Górny
2018-08-01 13:34 Michał Górny
2018-08-01 12:24 Michał Górny
2018-04-29  6:33 Michał Górny
2018-04-27  6:34 Michał Górny
2018-01-08 19:41 Michał Górny
2017-12-27 18:20 Michał Górny
2017-11-16 12:33 Michał Górny
2017-11-11 15:07 Michał Górny
2017-11-05 12:20 Michał Górny
2017-11-05 12:20 Michał Górny
2017-11-05 12:20 Michał Górny
2017-10-15 10:09 Michał Górny
2017-10-15  7:30 Michał Górny
2017-10-15  7:14 Michał Górny
2017-06-09 23:10 Michał Górny
2017-04-25 21:49 Michał Górny
2017-04-25 21:49 Michał Górny
2017-04-25 21:49 Michał Górny
2017-04-25 21:49 Michał Górny
2017-04-08  5:42 Michał Górny
2017-03-08 11:32 Michał Górny
2017-03-08 11:32 Michał Górny
2016-09-07 17:11 Michał Górny
2016-09-07 17:11 Michał Górny
2016-09-03 17:35 Michał Górny
2016-07-29 15:09 Michał Górny
2016-07-03  8:19 Michał Górny
2016-06-09 16:10 Michał Górny
2016-06-09 16:10 Michał Górny
2016-06-06 19:17 Michał Górny
2016-06-03 12:57 Anthony G. Basile
2016-05-14  9:07 Michał Górny
2016-05-14  9:07 Michał Górny
2016-03-12 13:41 Michał Górny
2016-03-03 10:47 Michał Górny
2015-12-20 21:13 Michał Górny
2015-11-27 19:49 Michał Górny
2015-08-15  7:12 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1670418251.05a1f25f2ce121549ac19f5ac2bf4a7bdc4233c2.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox