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

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

commit:     e36d2a8d9f3ebf5420ae36392f50f4420dae8946
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 22:19:11 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 23:19:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e36d2a8d

dev-python/pypy-bin: Clean old up

 dev-python/pypy-bin/Manifest              |   7 --
 dev-python/pypy-bin/pypy-bin-5.8.0.ebuild | 189 ------------------------------
 2 files changed, 196 deletions(-)

diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 6300389f885..19934f254fe 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -8,11 +8,6 @@ DIST pypy-bin-5.10.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6264162 BLAKE2B 67bb
 DIST pypy-bin-5.10.0-x86+bzip2+libressl+ncurses.tar.lz 6252626 BLAKE2B 6f036b0a526a2ef2c6ea0d559baaae13d4ec0da2d4705c959ec84c85fdde171319da9be1a2d859ebf2c7d6168464dccb057904596a64c0ddc33724a706e699da SHA512 5f284ae0230b22775978525d2f53b57f5c808b6a47b783b6bdccbb9727af412f640abe79e7c05792acdda861719ed9a0c392a9c906237514ad4285f50e283ff0
 DIST pypy-bin-5.10.0-x86+bzip2+ncurses+sse2.tar.lz 5912628 BLAKE2B 5859cb60c9cc68cba1bf3e1f3f58ff8e86d352aef990a837baf5a1802116dda4bc9e550a3c38163d7a165efc65ff26fc1c004dbb845a4df401ca6c986866a658 SHA512 d2aee265718cd75e02ad4e8dc7cedcf006180960128a10cc4b3b1920092860a1d1a110c27b60d45b88ef99822e0a2e9c74c2c7d3c899ef049adc9916ea5fefb4
 DIST pypy-bin-5.10.0-x86+bzip2+ncurses.tar.lz 5912272 BLAKE2B e50e3f5cc2c8411700f00009bfb6d9fe0c06b32faed6fc5b94dfd3eeb404e37fe353741aeb0851a4e42dc86e2bed524750cfe527bfc005abbec4cfa6e65444e1 SHA512 ea63b7ff20633bcec55258cf02d0035e213e94595032cf7a43342292cbdd4bf4276ea36d299bb3342e6de8919dadb338f879393950770473329ed6a0fd982897
-DIST pypy-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz 13029615 BLAKE2B fa2d6fa3bed0baef16af8b18bc0a9b76a960e5defbccdb3f059d2fd6d0a3613968e42ee49e82bf26f63058d0d1f74540a30d663afca896f3de929b16b04750ef SHA512 4234bb85c527999fc9ec91e7187d7b05e9aa5fa9965ac4a7fa7a652f678b1221cd04d119316073c5f8352d7bd533c4a7b1c79f5cafce6eb04f32b0a764fdf36d
-DIST pypy-bin-5.8.0-amd64+bzip2+ncurses.tar.lz 7617650 BLAKE2B 9eb3715cf2a783917b1d1e8ba38511f9b41c8f991211e08a3078ec8709bc5a43755b833e8594f820c3f3693fbb4731c6d9fd4ab1b6d0701003dafdb4342a0198 SHA512 532d7fd9bdb92b1d5c8e8ebcf60c56fbe2a32b8b89f8650d91b6e0a7cfe6733e3e6b6b232f02a6f24bf9f30569dd8b9cce0b93268d0bb45cd808671ee41be3ae
-DIST pypy-bin-5.8.0-x86+bzip2+jit+ncurses+sse2.tar.lz 10744836 BLAKE2B ef49f3ccfc1f9b7f975f3b36b323257765e5c1b886b753fff6a222bac463d54de54d2e2b50fd7038c8229cc70b2d444759e955348352326600b97cf74695c453 SHA512 bd39bad8f292eabae37b384b9f9f36bc221606b1d2d4aa3df8a45fb1f7ad94755d5fe5dbb7983a49c4e44df87f745ce00691bcb3a5b6c197509c360d9b24d24c
-DIST pypy-bin-5.8.0-x86+bzip2+ncurses+sse2.tar.lz 6493961 BLAKE2B 900999ed0b079785b5e1610ca19d5e99c4490519654e32ce1ee74f5cf4e11bfd6532c1e3498692ea0b84f3998aeab1702159ba20ef59d6a58816b8c82fae1878 SHA512 97075ef6589d4671dd8ea79fb87c42842023b3f9b5539b3aed8ed90785e001d9725937fb21cf1339df6425ddb50e1e9aab42630770ed39bbd96e953c6369c249
-DIST pypy-bin-5.8.0-x86+bzip2+ncurses.tar.lz 6489741 BLAKE2B 02241882de7b7f8db0fbfe9b61df12046c4c41084d3c432f6098661eecb1421a635ca2c6497bfc459bc8f009495322c3e9cda48da77a1fb87fc8c33f76dd89fa SHA512 e15572f318b0c1f1d68cdb8c1068de853443c7b350b8aa25b41db50d075e2bb6c53530a035c31c98b530e96742c10d0e92ca20081ffefbe475d00e0974aa8b85
 DIST pypy-bin-5.9.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12726957 BLAKE2B afbb25d0084a4040dd296212f5d5be130c288ee79bf3c7110e3ef53fb0d1469d5294194163004c7efda388f86a3a761b780ee348f2cd9cb070318efdc6b4eff1 SHA512 25256218106fc71f0179fe5b175e780be200a44bf500a5814c05c767747201370b19943d76f4859d780c9799d583d809c8c6ba49423ddad477b974b927625d3e
 DIST pypy-bin-5.9.0-amd64+bzip2+jit+ncurses.tar.lz 12849816 BLAKE2B 4655cf9bc6e3ac64713577615927752dd86b7a0b73764a782e7e7f1a54da50b7a8fad462933cd06b82a78d21809e76fb7614a5b3756f2abf67d8e0c41b025914 SHA512 d4d67f2281d01ecb19602fdaf1149e424e6e331d9e98278ed5f0a948e7ef8b6dc0307accc5d924cb9491f789cea2285cdc9e16f0e9f0c1b76804d259ce5df6bb
 DIST pypy-bin-5.9.0-amd64+bzip2+libressl+ncurses.tar.lz 7419957 BLAKE2B 13f14e0ff3337d13f634bc90033340341d2c9eba3665b36b746a54983aab9887ea3f939ec3c552bc7b4e6f4a11376d41d4e5cbd0514f007e97f2eeb05d5c147e SHA512 a0be5a190fc3f71291a65a14a5993fd95f4f077070b812d0aff7b0110bc5dacbd2e005476f97d6b386f2093086621609a64b2a728d9d3d0e70948caaede53292
@@ -24,7 +19,5 @@ DIST pypy-bin-5.9.0-x86+bzip2+libressl+ncurses.tar.lz 6262511 BLAKE2B bf70bf73bc
 DIST pypy-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 6269532 BLAKE2B b0ca490135a6b4215a09e5dea24be5c950fba24aceca50bf2e04ad0b3bb5e6a8511b167e567aea9d3ca9b92a53d093c3746b38abd9e5266148621733430767ce SHA512 ee447e8b03733b41f92625a02653ed70a9f4cb3866a27bcbdbaf1383a00551c5f4617540eea227b120a7adab5cf87afddffde663c7cb79abde852e0bbf18d622
 DIST pypy-bin-5.9.0-x86+bzip2+ncurses.tar.lz 6261498 BLAKE2B 7d0dace223ae6793ca18b36628f7a43b20d55d6b702c6dd0bad413055261614bedba265f2f1411bdf4543ca64612d32cda93f609c2433a3fc10e3fe44aab3984 SHA512 6151ed379dc3dd4d9eda892718a5cdeea55386251c27230cb4606fd0a16589035de332c549d108d699c506f8ff46bed3cec3edb960155550a9746ae2fc0d2349
 DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379
-DIST pypy2-v5.8.0-src.tar.bz2 19163498 BLAKE2B 377971cf9e9a5ea75966937e9f22fe24d149af28678947d33356333fe67c8295cf07bf2dac3e7b45d265fef6126d8ebb23aee132e3b43d872bd61ec1ddf17a2c SHA512 222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365
 DIST pypy2-v5.9.0-src.tar.bz2 19175394 BLAKE2B 0d5fa0d013d8cdb9765bf0f535877894d7a3544c19481973f788187251d1bd2ba11f88950430e85c7608ea394cc952ae7dd7275b9843397ab098e153cf96ec7f SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
-DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 BLAKE2B cf60845f320f46b6be3755a50bb24b8c55478caaa86877f35015f4187eadaaa2f0e95216f04eca3c9c3fe8347ca3b82c529435033e7935f32067ad45cca5d18f SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1

diff --git a/dev-python/pypy-bin/pypy-bin-5.8.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.8.0.ebuild
deleted file mode 100644
index b15095865fd..00000000000
--- a/dev-python/pypy-bin/pypy-bin-5.8.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.13-0"
-MY_P=pypy2-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-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		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 )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit sqlite cpu_flags_x86_sse2 test tk"
-
-# yep, world would be easier if people started filling subslots...
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/expat:0=
-	dev-libs/libffi:0=
-	dev-libs/openssl:0=[-bindist]
-	sys-libs/glibc:2.2=
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	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
-	doc? ( ${PYTHON_DEPS}
-		dev-python/sphinx )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use doc && python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-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 "${WORKDIR}"/patches/62_all_xml.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
-
-	use doc && emake -C pypy/doc/ html
-	#needed even without jit :( also needed in both compile and install phases
-	pax-mark m pypy-c libpypy-c.so
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	insinto "${dest}"
-	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
-	fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	dosym ../$(get_libdir)/pypy/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
-
-	# Install docs
-	use doc && dodoc -r pypy/doc/_build/html
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -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 "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}