[gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-bin/

["Michał Górny" <mgorny@gentoo.org>]

commit:     c89691bde9b514affe88e4023f8b0aff5b607746
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 13:51:38 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 14:21:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c89691bd

dev-python/pypy-bin: Bump to 7.1.0

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

 dev-python/pypy-bin/Manifest              |  11 ++
 dev-python/pypy-bin/pypy-bin-7.1.0.ebuild | 208 ++++++++++++++++++++++++++++++
 2 files changed, 219 insertions(+)

diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 910b5e2468d..1edd67206bf 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -33,7 +33,18 @@ DIST pypy-bin-7.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6050854 BLAKE2B a8fb8
 DIST pypy-bin-7.0.0-x86+bzip2+libressl+ncurses.tar.lz 6010259 BLAKE2B e841ff1809424a06b018d8ca219aa57d6bc0942e2bfdae545bed548efbca0d19e84365d5e9d0fd3324904d9ed8c5e50bee5b87ffa9742af7d23af84abd11ce82 SHA512 1f736593a1ae0c49e6929498a655bf778a826cb104908356c1ce13298c36fbdb55d4a8de0e39571d74d9ff3757815e81249b301983d6d3efa8cdd21497781603
 DIST pypy-bin-7.0.0-x86+bzip2+ncurses+sse2.tar.lz 6023604 BLAKE2B 07a218bffe485e6b39bea2f901a2de473ce7f6e334739bcc8d9fc9aff1e83cd2fd72aeb420a61464e69bfd9eb9468ae8401a597e8b8251bbdeae5b5644dc44ac SHA512 e74a868e6e12e266d75feeeddf4df700eeb84be70d6f259efa1a5effb0c9c0fe5d228c16f5015b2b993540f17e3b2f45644f6b1ba0356dfe71b778358983e2a8
 DIST pypy-bin-7.0.0-x86+bzip2+ncurses.tar.lz 6022022 BLAKE2B 26f7e87cdbafafe956e143bc5b6814ac9db2e1a3a53a5dc7c10ed436192645951e2a4966514081df94fb918b871a15b68afc55289e611fa04339591a81d3f90d SHA512 47a8d1ae2c3ba5caf7b0c08c37b01f7ef7dc3b2fd44ad2f61823305e02cdfac551080b80958bc1dfbe738fd5da960f43a37bec318e2805b8bdf90dac4dfab5b9
+DIST pypy-bin-7.1.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 13185942 BLAKE2B 74c7478c8869b12d78c0173494eebd563fc704ee79a2b2eccd177b714efe1e96025a198cdd916e6a18f7ddeb14c34737198a323c85b7715e9f53363ad64f784b SHA512 ab390b0b9edd4707c96eb68369c5c7d2de6c71dcc2f8f34bec0f9c9aec6b85106c81cd3cb101ba756dc369ac45f109a93e14bf4f5037bebf108577f7686a316f
+DIST pypy-bin-7.1.0-amd64+bzip2+jit+ncurses.tar.lz 13079893 BLAKE2B 6818a3282569ed3c3b0d462d5bc3003d4eae31dd811f863ec78b11c1ce6242da9a7c7af8c1b75b677d3b0fa0c4845a3bfb8a964dba21d1d050b5c25396168a52 SHA512 38a66d4143d4b9de0d735a1131f72bc259ba2128e4bad1786d56288bcc28da49df588d790514b29c9ea5a8cb45523a853690ff0637941fe47d7be1be96633e02
+DIST pypy-bin-7.1.0-amd64+bzip2+libressl+ncurses.tar.lz 7683507 BLAKE2B 1c7ab3cc128f40499740978cd2edd6c9dcb3a92df1c3dea398c4bb759afda15c04539c39b487875a70a7982eba91b55ba8966398a53d79f3c6b41dc7f09b303f SHA512 abf5e8d084d3270b1658564af5a5e786ef3dc5296b5379671dfbccd56d231d2b43da7482089b0877858d9e04c99f86e09db0b22c3735e4d7a2f44f62026d2a46
+DIST pypy-bin-7.1.0-amd64+bzip2+ncurses.tar.lz 7765738 BLAKE2B 3e535cc65a4bf3c61cdd7dd34dd4fc9ce731c762aa2d85aa5efed82f78bb69b55ba6f92e5cad83e8123c1fc60e0be43e9a86a8c429f45d435ed84c1610c726bb SHA512 31f103e95a8e8878dcdfdd0f5b8ec1546f866c2aee8dad4a3bb66e3bdf1a3933ad5c844b2a4453477c5e69a8a869962e2325dbbb5c23b529f7d57d27b99762a1
+DIST pypy-bin-7.1.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10015037 BLAKE2B 3dd9612f2329eca5816dfd08fd2a82cdfb0b8461cbcafb5abc0f270b8ef686bd69d87d240e0368e6a69681f369c99d350aac4fd300330b5c2038ad139b737585 SHA512 a593a3b3ba48f97ff531ac7d6539d7e52e56bbe3c766ff28e7380bf2661e6bd2282d588fe31765cbcd589254dd1c239da468487a846647919a8dc7c2aa03a998
+DIST pypy-bin-7.1.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9986329 BLAKE2B 19eba48891da80bc4922a6d3fcd8278091a045a4f8371b4bb1a787eec1cdd7668f8ca78039bfc2df4c2164dc3256b3c3ead5b342bbfc42491dd2ea7709e6fe71 SHA512 1a6c57b559458094ee1867cf9f4547004f31f928e340684145be9f598470bddaa7e0c94354fb3de8d51742ab666893437238ab0f81337ad6d137eddfe279e660
+DIST pypy-bin-7.1.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6093992 BLAKE2B e9cc966e4fe6a3c2d2cf4193abc0e3d8b81b5353e690ce3b11ff199cfc30c3e1dceda2d26d04cab1848a04e49c62c91912404d002624b94408e81ac667680d47 SHA512 0bbd040e7e9161209a056136a508bd3befa123f3086f165b0de05d404996fabda9fb0ba360be31bac2d80056e5b8d7081a9d47433ee5b1386a859c8b97aeb544
+DIST pypy-bin-7.1.0-x86+bzip2+libressl+ncurses.tar.lz 6090777 BLAKE2B bcb332825409a50c57d09ac67c21104a88c58b237b84ce4c31484c3b81afeb783dc140123773fe5702df41002eb44b403bf29dbda1c66a40ef9aa037d6ae6217 SHA512 3a65faf263085abb2f1652b58e6da1712dc8632f27944bdabec1d9ddcd21065babc30967942717d7ca179ce449f94175b0d03ca44179afaed55a32d11bb7e9d8
+DIST pypy-bin-7.1.0-x86+bzip2+ncurses+sse2.tar.lz 6093175 BLAKE2B 31a7e0b517370bb5f77372361205e5f24d8e129004af3430b3d2e3b2c58f455eb7fb2e88f86419d498724202349777189aea40cdf90eeec73b83a37a185aa653 SHA512 daeef87f64f5efd77e178fbdc6a85c0170db3d351c6951439c74ab3cef1641db8ab9266ac3d1e2b8e0a1efd2d2b1b90a1576ee21c069d8fe62fb1274ed49ed24
+DIST pypy-bin-7.1.0-x86+bzip2+ncurses.tar.lz 6089713 BLAKE2B 8e733f4bf527fc5ecff06907d96dc8a8462b3f92cf5e328e8e232f54e7ad26303fc38b127d481ad70dccd406ef0b752619899ba45b18b3e1ad9ed692e6529a18 SHA512 b8b66a23c8b03b2840d721291b7ac39a9a0617acc7e54e3da35a930a37f8f64b95eb784c0a010513575972ad7477751966360dc0de10659f4b481d9ed275dafd
 DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
 DIST pypy2.7-v7.0.0-src.tar.bz2 19811330 BLAKE2B 38089896934d79d2b3f5813cc9dae23b0534d9d312871b22336a277d5a15b82d748f66f896558cfdb45a23004944a648436e89ae36fadc107930e7b99963e12b SHA512 7fb5682ee4226af51008f50a81c922e44c231410fe36b7656efa20f22c855ba30a01bc96ee897b4c7a02941d37a405c922b09855977313878e34aaad6bf023dc
+DIST pypy2.7-v7.1.0-src.tar.bz2 20032490 BLAKE2B e916d63d7915959c87830509630d8b2ab993d012d314e88c7cc84bed4c595957c3fc575f7b57fac7c24aaf1492797ca43b146e457357b6e73d9772724461de66 SHA512 fa7c1a6669686dbd9c0da627dc2a06ad696f20274218af9602f91d73f3ebe0ede380c6e1a50534f53dee8f075eaef5a403c7c5b5bdbfff25e679ba30522391bb
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca

diff --git a/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild
new file mode 100644
index 00000000000..53daf3ce27b
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1 unpacker
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
+CPY_PATCHSET_VERSION="2.7.15"
+MY_P=pypy2.7-v${PV}
+
+DESCRIPTION="Pre-built version of PyPy"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
+	amd64? (
+		!libressl? (
+			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+		)
+		libressl? (
+			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
+			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
+		)
+	)
+	x86? (
+		!libressl? (
+			cpu_flags_x86_sse2? (
+				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
+			)
+			!cpu_flags_x86_sse2? (
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
+			)
+		)
+		libressl? (
+			cpu_flags_x86_sse2? (
+				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
+			)
+			!cpu_flags_x86_sse2? (
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
+			)
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+# pypy 7.0.0: install directory changed to 'pypy2.7'
+SLOT="0/41-py27"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/7
+	sys-devel/gcc:*
+	>=sys-libs/glibc-2.28
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0/1
+	gdbm? ( sys-libs/gdbm:0= )
+	!libressl? ( dev-libs/openssl:0/1.1[-bindist] )
+	libressl? ( dev-libs/libressl:0/44 )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	app-arch/xz-utils"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c
+	usr/lib/pypy2.7/libpypy-c.so"
+
+src_prepare() {
+	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h 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 libpypy-c.so
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop curses syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	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
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	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
+		# no module named 'worker' -- a lot
+		--ignore=lib-python/2.7/test/test_xpickle.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 ..."
+	exeinto "${dest}"
+	doexe pypy-c libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	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
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}