dev-python/pypy: Clean old up
authorMichał Górny <mgorny@gentoo.org>
Fri, 5 Jan 2018 22:18:36 +0000 (23:18 +0100)
committerMichał Górny <mgorny@gentoo.org>
Fri, 5 Jan 2018 23:19:24 +0000 (00:19 +0100)
dev-python/pypy/Manifest
dev-python/pypy/files/2.5.0-shared-lib.patch [deleted file]
dev-python/pypy/pypy-5.8.0.ebuild [deleted file]

index ad7d1d11ef4cf572b46dd7e6e30a66a6737f96a3..f88e142d58defa43e66bfb0cbfadcc1f78fa8a87 100644 (file)
@@ -1,5 +1,3 @@
 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/files/2.5.0-shared-lib.patch b/dev-python/pypy/files/2.5.0-shared-lib.patch
deleted file mode 100644 (file)
index b5c877b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur pypy-2.5.0-src.orig/rpython/translator/platform/posix.py pypy-2.5.0-src/rpython/translator/platform/posix.py
---- a/rpython/translator/platform/posix.py     2015-02-03 05:12:49.000000000 +0800
-+++ b/rpython/translator/platform/posix.py     2015-03-22 07:36:01.420116684 +0800
-@@ -183,7 +183,7 @@
-                    'int main(int argc, char* argv[]) '
-                    '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
-             m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
--                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) -o $@ $(RPATH_FLAGS)')
-+                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@')
-         return m
diff --git a/dev-python/pypy/pypy-5.8.0.ebuild b/dev-python/pypy/pypy-5.8.0.ebuild
deleted file mode 100644 (file)
index ff7d02e..0000000
+++ /dev/null
@@ -1,268 +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 check-reqs pax-utils python-any-r1 toolchain-funcs versionator
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.13-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-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"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-       virtual/libffi:0=
-       virtual/libintl:0=
-       dev-libs/expat:0=
-       !libressl? ( dev-libs/openssl:0=[-bindist] )
-       libressl? ( dev-libs/libressl:0= )
-       bzip2? ( app-arch/bzip2:0= )
-       gdbm? ( sys-libs/gdbm:0= )
-       ncurses? ( sys-libs/ncurses:0= )
-       sqlite? ( dev-db/sqlite:3= )
-       tk? (
-               dev-lang/tk:0=
-               dev-tcltk/tix:0=
-       )
-       !dev-python/pypy-bin:0"
-DEPEND="${RDEPEND}
-       doc? ( dev-python/sphinx )
-       ${PYTHON_DEPS}
-       test? ( dev-python/pytest )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-       if use low-memory; then
-               if ! python_is_installed pypy; then
-                       eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-                       eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-                       eerror
-                       eerror "  $ emerge -1v dev-python/pypy-bin"
-                       eerror
-                       eerror "before attempting to build dev-python/pypy[low-memory]."
-                       die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-               fi
-
-               CHECKREQS_MEMORY="1750M"
-               use amd64 && CHECKREQS_MEMORY="3500M"
-       else
-               CHECKREQS_MEMORY="3G"
-               use amd64 && CHECKREQS_MEMORY="6G"
-       fi
-
-       check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-       [[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               check_env
-
-               if python_is_installed pypy; then
-                       if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-                               einfo "Using already-installed PyPy to perform the translation."
-                               local 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."
-                       fi
-               fi
-
-               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"
-       eapply "${FILESDIR}"/2.5.0-shared-lib.patch     # 517002
-
-       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_configure() {
-       tc-export CC
-
-       local jit_backend
-       if use jit; then
-               jit_backend='--jit-backend='
-
-               # We only need the explicit sse2 switch for x86.
-               # On other arches we can rely on autodetection which uses
-               # compiler macros. Plus, --jit-backend= doesn't accept all
-               # the modern values...
-
-               if use x86; then
-                       if use cpu_flags_x86_sse2; then
-                               jit_backend+=x86
-                       else
-                               jit_backend+=x86-without-sse2
-                       fi
-               else
-                       jit_backend+=auto
-               fi
-       fi
-
-       local args=(
-               --shared
-               $(usex jit -Ojit -O2)
-               $(usex sandbox --sandbox '')
-
-               ${jit_backend}
-
-               pypy/goal/targetpypystandalone
-       )
-
-       # Avoid linking against libraries disabled by use flags
-       local opts=(
-               bzip2:bz2
-               ncurses:_minimal_curses
-       )
-
-       local opt
-       for opt in "${opts[@]}"; do
-               local flag=${opt%:*}
-               local mod=${opt#*:}
-
-               args+=(
-                       $(usex ${flag} --withmod --withoutmod)-${mod}
-               )
-       done
-
-       local interp=( "${PYTHON}" )
-       if use low-memory; then
-               interp=( env PYPY_GC_MAX_DELTA=200MB
-                       "${PYTHON}" --jit loop_longevity=300 )
-       fi
-
-       # translate into the C sources
-       # we're going to make them ourselves since otherwise pypy does not
-       # free up the unneeded memory before spawning the compiler
-       set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-       echo -e "\033[1m${@}\033[0m"
-       "${@}" || die "translation failed"
-}
-
-src_compile() {
-       emake -C "${T}"/usession*-0/testing_1
-
-       # copy back to make sys.prefix happy
-       cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-       pax-mark m pypy-c libpypy-c.so
-
-       use doc && emake -C pypy/doc html
-}
-
-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 ..."
-       exeinto "${dest}"
-       doexe pypy-c libpypy-c.so
-       pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-       insinto "${dest}"
-       doins -r include lib_pypy lib-python
-       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 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 "${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}"
-}