commit: e1ac9809d47a37efdcc535cd6b6a6d41068833dc Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Nov 27 16:09:30 2015 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Nov 27 16:11:08 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ac9809
dev-python/pypy: Remove old dev-python/pypy/Manifest | 2 - .../pypy/files/2.3-21_all_distutils_c++.patch | 321 --------------------- dev-python/pypy/files/2.3.1-shared-lib.patch | 11 - dev-python/pypy/pypy-2.4.0.ebuild | 233 --------------- dev-python/pypy/pypy-2.5.1.ebuild | 233 --------------- 5 files changed, 800 deletions(-) diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest index 8a06322..f5e2f43 100644 --- a/dev-python/pypy/Manifest +++ b/dev-python/pypy/Manifest @@ -1,5 +1,3 @@ -DIST pypy-2.4.0-src.tar.bz2 15495214 SHA256 38810007aee4885ca0703b566db6594dd7649adaaa287df7a1012f10e067740f SHA512 91b41ed80a6ff0d7b2b134a7802f098de35ffd2068dc3e477d27b0bc821c6d329eb8bcad4db4a5ff9ff429830d4abfbeb435a2a2d2d9bbc2c36f2d21af0b2e0c WHIRLPOOL affb14b805b2dcb8b579dd421bfb8276e80d3b31cea41bf57ad5dd9260e2e27d838b0303e4a3af5ca38b0b4f08ac88b142d6f1db20753bec6f8cbfdfc482099b -DIST pypy-2.5.1-src.tar.bz2 16740876 SHA256 ddb3a580b1ee99c5a699172d74be91c36dda9a38946d4731d8c6a63120a3ba2a SHA512 ac4cab47566d7d4e1a293a680e0dffa301c99a8329c2e68f645f186c0266cbe8f045a03e392c0cc2112a16178037cd978b7867ad073bf5dd957dd19f4c818067 WHIRLPOOL 6f16c4090780081dfe1d4642186262c66d4ac1a4b3b8311e573bfa6029eb7aac0483b3e48cad5ce03879391a4e316c0186d33fac5e86d0024ff20cc6d4dc0dd3 DIST pypy-2.6.0-src.tar.bz2 16858400 SHA256 9bf353f22d25e97a85a6d3766619966055edea1ea1b2218445d683a8ad0399d9 SHA512 82a6a44c0c551a1291215394610e5331cf83216b38ac9f1a79a3eab53ba2933b121c3154b58cead814c73a1da1fc95d895324bb0c43e8e0429438b0dea527cc4 WHIRLPOOL e536ff5d3b393c6834fd721f383318b5dcef79046f475b0f1fe737c67c56e8769cabc0a35f553da5dc475a255c5711de01bd6d42e541cabbab3b9e30f20c9a5c DIST pypy-4.0.0-src.tar.bz2 17244624 SHA256 acff480e44ce92acd057f2e786775af36dc3c2cd12e9efc60a1ac6a562ad7b4d SHA512 2bbdc2536a32b0aa28f7b12ec3d879ed28afe984fad38635bc3e1d950a9fe198cfbaf9b554f0fa245e7fd512ec7a76297f05a1d3e17f73fb49e8506561190f5b WHIRLPOOL e94bdf5e8ea2cbab8e25d37bb7cb36b9bae773ec051d603cfce784e0fd8e591ed16e6896f49d14d9ae094c5f613a0ba871380c8adc2a1cf0023157e3e2a51f52 DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056 WHIRLPOOL f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9 diff --git a/dev-python/pypy/files/2.3-21_all_distutils_c++.patch b/dev-python/pypy/files/2.3-21_all_distutils_c++.patch deleted file mode 100644 index 2787360..0000000 --- a/dev-python/pypy/files/2.3-21_all_distutils_c++.patch +++ /dev/null @@ -1,321 +0,0 @@ -http://bugs.python.org/issue1222585 - ---- Lib/distutils/cygwinccompiler.py -+++ Lib/distutils/cygwinccompiler.py -@@ -117,8 +117,10 @@ - # dllwrap 2.10.90 is buggy - if self.ld_version >= "2.10.90": - self.linker_dll = "gcc" -+ self.linker_dll_cxx = "g++" - else: - self.linker_dll = "dllwrap" -+ self.linker_dll_cxx = "dllwrap" - - # ld_version >= "2.13" support -shared so use it instead of - # -mdll -static -@@ -132,9 +134,13 @@ - self.set_executables(compiler='gcc -mcygwin -O -Wall', - compiler_so='gcc -mcygwin -mdll -O -Wall', - compiler_cxx='g++ -mcygwin -O -Wall', -+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', - linker_exe='gcc -mcygwin', - linker_so=('%s -mcygwin %s' % -- (self.linker_dll, shared_option))) -+ (self.linker_dll, shared_option)), -+ linker_exe_cxx='g++ -mcygwin', -+ linker_so_cxx=('%s -mcygwin %s' % -+ (self.linker_dll_cxx, shared_option))) - - # cygwin and mingw32 need different sets of libraries - if self.gcc_version == "2.91.57": -@@ -160,8 +166,12 @@ - raise CompileError, msg - else: # for other files use the C-compiler - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -@@ -327,9 +337,14 @@ - self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin, - compiler_so='gcc%s -mdll -O -Wall' % no_cygwin, - compiler_cxx='g++%s -O -Wall' % no_cygwin, -+ compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin, - linker_exe='gcc%s' % no_cygwin, - linker_so='%s%s %s %s' - % (self.linker_dll, no_cygwin, -+ shared_option, entry_point), -+ linker_exe_cxx='g++%s' % no_cygwin, -+ linker_so_cxx='%s%s %s %s' -+ % (self.linker_dll_cxx, no_cygwin, - shared_option, entry_point)) - # Maybe we should also append -mthreads, but then the finished - # dlls need another dll (mingwm10.dll see Mingw32 docs) ---- Lib/distutils/emxccompiler.py -+++ Lib/distutils/emxccompiler.py -@@ -65,8 +65,12 @@ - # XXX optimization, warnings etc. should be customizable. - self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', - compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', -+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', -+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', - linker_exe='gcc -Zomf -Zmt -Zcrtdll', -- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') -+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll', -+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll', -+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll') - - # want the gcc library statically linked (so that we don't have - # to distribute a version dependent on the compiler we have) -@@ -83,8 +87,12 @@ - raise CompileError, msg - else: # for other files use the C-compiler - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - ---- Lib/distutils/sysconfig_cpython.py -+++ Lib/distutils/sysconfig_cpython.py -@@ -170,10 +170,12 @@ - _osx_support.customize_compiler(_config_vars) - _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' - -- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', -- 'CCSHARED', 'LDSHARED', 'SO', 'AR', -- 'ARFLAGS') -+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'SO', 'AR', 'ARFLAGS') -+ -+ cflags = '' -+ cxxflags = '' - - if 'CC' in os.environ: - newcc = os.environ['CC'] -@@ -188,19 +190,27 @@ - cxx = os.environ['CXX'] - if 'LDSHARED' in os.environ: - ldshared = os.environ['LDSHARED'] -+ if 'LDCXXSHARED' in os.environ: -+ ldcxxshared = os.environ['LDCXXSHARED'] - if 'CPP' in os.environ: - cpp = os.environ['CPP'] - else: - cpp = cc + " -E" # not always - if 'LDFLAGS' in os.environ: - ldshared = ldshared + ' ' + os.environ['LDFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] - if 'CFLAGS' in os.environ: -- cflags = opt + ' ' + os.environ['CFLAGS'] -+ cflags = os.environ['CFLAGS'] - ldshared = ldshared + ' ' + os.environ['CFLAGS'] -+ if 'CXXFLAGS' in os.environ: -+ cxxflags = os.environ['CXXFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] - if 'CPPFLAGS' in os.environ: - cpp = cpp + ' ' + os.environ['CPPFLAGS'] - cflags = cflags + ' ' + os.environ['CPPFLAGS'] -+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] - ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] - if 'AR' in os.environ: - ar = os.environ['AR'] - if 'ARFLAGS' in os.environ: -@@ -209,13 +219,17 @@ - archiver = ar + ' ' + ar_flags - - cc_cmd = cc + ' ' + cflags -+ cxx_cmd = cxx + ' ' + cxxflags - compiler.set_executables( - preprocessor=cpp, - compiler=cc_cmd, - compiler_so=cc_cmd + ' ' + ccshared, -- compiler_cxx=cxx, -+ compiler_cxx=cxx_cmd, -+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, - linker_so=ldshared, - linker_exe=cc, -+ linker_so_cxx=ldcxxshared, -+ linker_exe_cxx=cxx, - archiver=archiver) - - compiler.shared_lib_extension = so_ext ---- Lib/distutils/unixccompiler.py -+++ Lib/distutils/unixccompiler.py -@@ -55,14 +55,17 @@ - # are pretty generic; they will probably have to be set by an outsider - # (eg. using information discovered by the sysconfig about building - # Python extensions). -- executables = {'preprocessor' : None, -- 'compiler' : ["cc"], -- 'compiler_so' : ["cc"], -- 'compiler_cxx' : ["cc"], -- 'linker_so' : ["cc", "-shared"], -- 'linker_exe' : ["cc"], -- 'archiver' : ["ar", "-cr"], -- 'ranlib' : None, -+ executables = {'preprocessor' : None, -+ 'compiler' : ["cc"], -+ 'compiler_so' : ["cc"], -+ 'compiler_cxx' : ["c++"], -+ 'compiler_so_cxx' : ["c++"], -+ 'linker_so' : ["cc", "-shared"], -+ 'linker_exe' : ["cc"], -+ 'linker_so_cxx' : ["c++", "-shared"], -+ 'linker_exe_cxx' : ["c++"], -+ 'archiver' : ["ar", "-cr"], -+ 'ranlib' : None, - } - - if sys.platform[:6] == "darwin": -@@ -112,12 +115,19 @@ - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - compiler_so = self.compiler_so -+ compiler_so_cxx = self.compiler_so_cxx - if sys.platform == 'darwin': - compiler_so = _osx_support.compiler_fixup(compiler_so, - cc_args + extra_postargs) -+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, -+ cc_args + extra_postargs) - try: -- self.spawn(compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -@@ -174,23 +184,16 @@ - ld_args.extend(extra_postargs) - self.mkpath(os.path.dirname(output_filename)) - try: -- if target_desc == CCompiler.EXECUTABLE: -- linker = self.linker_exe[:] -+ if target_lang == "c++": -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe_cxx[:] -+ else: -+ linker = self.linker_so_cxx[:] - else: -- linker = self.linker_so[:] -- if target_lang == "c++" and self.compiler_cxx: -- # skip over environment variable settings if /usr/bin/env -- # is used to set up the linker's environment. -- # This is needed on OSX. Note: this assumes that the -- # normal and C++ compiler have the same environment -- # settings. -- i = 0 -- if os.path.basename(linker[0]) == "env": -- i = 1 -- while '=' in linker[i]: -- i = i + 1 -- -- linker[i] = self.compiler_cxx[i] -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe[:] -+ else: -+ linker = self.linker_so[:] - - if sys.platform == 'darwin': - linker = _osx_support.compiler_fixup(linker, ld_args) ---- Lib/_osx_support.py -+++ Lib/_osx_support.py -@@ -14,13 +14,13 @@ - # configuration variables that may contain universal build flags, - # like "-arch" or "-isdkroot", that may need customization for - # the user environment --_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', -- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', -- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', -- 'PY_CORE_CFLAGS') -+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', -+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', -+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') - - # configuration variables that may contain compiler calls --_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') -+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') - - # prefix added to original configuration variable names - _INITPRE = '_OSX_SUPPORT_INITIAL_' ---- a/distutils/sysconfig_pypy.py -+++ b/distutils/sysconfig_pypy.py -@@ -123,7 +123,55 @@ - optional C speedup components. - """ - if compiler.compiler_type == "unix": -- compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit']) -+ cc = ' '.join(compiler.compiler) -+ cxx = ' '.join(compiler.compiler_cxx) -+ ldshared = ' '.join(compiler.linker_so) -+ ldcxxshared = ' '.join(compiler.linker_so_cxx) -+ -+ cflags = '' -+ cxxflags = '' -+ ccshared = '-fPIC' -+ -+ if 'CC' in os.environ: -+ cc = os.environ['CC'] -+ if 'CXX' in os.environ: -+ cxx = os.environ['CXX'] -+ if 'LDSHARED' in os.environ: -+ ldshared = os.environ['LDSHARED'] -+ if 'LDCXXSHARED' in os.environ: -+ ldcxxshared = os.environ['LDCXXSHARED'] -+ if 'CPP' in os.environ: -+ cpp = os.environ['CPP'] -+ else: -+ cpp = cc + " -E" # not always -+ if 'LDFLAGS' in os.environ: -+ ldshared = ldshared + ' ' + os.environ['LDFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] -+ if 'CFLAGS' in os.environ: -+ cflags = os.environ['CFLAGS'] -+ ldshared = ldshared + ' ' + os.environ['CFLAGS'] -+ if 'CXXFLAGS' in os.environ: -+ cxxflags = os.environ['CXXFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] -+ if 'CPPFLAGS' in os.environ: -+ cpp = cpp + ' ' + os.environ['CPPFLAGS'] -+ cflags = cflags + ' ' + os.environ['CPPFLAGS'] -+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] -+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] -+ -+ cc_cmd = cc + ' ' + cflags -+ cxx_cmd = cxx + ' ' + cxxflags -+ compiler.set_executables( -+ preprocessor=cpp, -+ compiler=cc_cmd, -+ compiler_so=cc_cmd + ' ' + ccshared, -+ compiler_cxx=cxx_cmd, -+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, -+ linker_so=ldshared, -+ linker_exe=cc, -+ linker_so_cxx=ldcxxshared, -+ linker_exe_cxx=cxx) - compiler.shared_lib_extension = get_config_var('SO') - if "CPPFLAGS" in os.environ: - cppflags = shlex.split(os.environ["CPPFLAGS"]) diff --git a/dev-python/pypy/files/2.3.1-shared-lib.patch b/dev-python/pypy/files/2.3.1-shared-lib.patch deleted file mode 100644 index ae1139f..0000000 --- a/dev-python/pypy/files/2.3.1-shared-lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rpython/translator/platform/posix.py -+++ rpython/translator/platform/posix.py -@@ -180,7 +180,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 $@') -+ '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@') - - return m - diff --git a/dev-python/pypy/pypy-2.4.0.ebuild b/dev-python/pypy/pypy-2.4.0.ebuild deleted file mode 100644 index 9442c70..0000000 --- a/dev-python/pypy/pypy-2.4.0.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 pypy ) -inherit check-reqs eutils multilib multiprocessing pax-utils \ - python-any-r1 toolchain-funcs versionator - -DESCRIPTION="A fast, compliant alternative implementation of the Python language" -HOMEPAGE="http://pypy.org/"; -SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2"; - -LICENSE="MIT" -SLOT="0/$(get_version_component_range 1-2 ${PV})" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 tk" - -RDEPEND=">=sys-libs/zlib-1.1.3:0= - virtual/libffi:0= - virtual/libintl:0= - dev-libs/expat:0= - dev-libs/openssl:0= - bzip2? ( app-arch/bzip2:0= ) - gdbm? ( sys-libs/gdbm:0= ) - ncurses? ( =sys-libs/ncurses-5*: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}" -PDEPEND="app-admin/python-updater" - -S="${WORKDIR}/${P}-src" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - 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 - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_pretend - - 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() { - epatch "${FILESDIR}/1.9-scripts-location.patch" \ - "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \ - "${FILESDIR}"/2.3.1-shared-lib.patch # 517002 - - pushd lib-python/2.7 > /dev/null || die - epatch "${FILESDIR}/2.3-21_all_distutils_c++.patch" - popd > /dev/null || die - - epatch_user -} - -src_compile() { - 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 shadowstack --gcrootfinder=shadowstack '') - $(usex sandbox --sandbox '') - - ${jit_backend} - --make-jobs=$(makeopts_jobs) - - 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 - - set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}" - echo -e "\033[1m${@}\033[0m" - "${@}" || die "compile error" - - use doc && emake -C pypy/doc/ html - pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" -} - -src_test() { - # (unset) - local -x PYTHONDONTWRITEBYTECODE - - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die -} - -src_install() { - einfo "Installing PyPy ..." - insinto "/usr/$(get_libdir)/pypy" - doins -r include lib_pypy lib-python pypy-c libpypy-c.so - fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so - pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so" - dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy - dodoc README.rst - - if ! use gdbm; then - rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die - fi - if ! use sqlite; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \ - "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \ - "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die - fi - - # Install docs - use doc && dohtml -r pypy/doc/_build/html/ - - einfo "Generating caches and byte-compiling ..." - - local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c - local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" - # 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 cache - # Please keep in sync with pypy/tool/release/package.py! - "${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)" - if use gdbm; then - "${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)" - fi - if use ncurses; then - "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)" - fi - if use sqlite; then - "${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)" - fi - if use tk; then - "${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)" - fi - - # Cleanup temporary objects - find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die - find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die - - # compile the installed modules - python_optimize "${ED%/}${INSDESTTREE}" -} diff --git a/dev-python/pypy/pypy-2.5.1.ebuild b/dev-python/pypy/pypy-2.5.1.ebuild deleted file mode 100644 index d12930c..0000000 --- a/dev-python/pypy/pypy-2.5.1.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 pypy ) -inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator - -DESCRIPTION="A fast, compliant alternative implementation of the Python language" -HOMEPAGE="http://pypy.org/"; -SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2"; - -LICENSE="MIT" -SLOT="0/$(get_version_component_range 1-2 ${PV})" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack 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= - dev-libs/openssl:0=[-bindist] - bzip2? ( app-arch/bzip2:0= ) - gdbm? ( sys-libs/gdbm:0= ) - ncurses? ( =sys-libs/ncurses-5*: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 )" -PDEPEND="app-admin/python-updater" - -S="${WORKDIR}/${P}-src" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - 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 - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - pkg_pretend - - 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() { - epatch "${FILESDIR}/1.9-scripts-location.patch" \ - "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \ - "${FILESDIR}"/2.5.0-shared-lib.patch # 517002 - - pushd lib-python/2.7 > /dev/null || die - epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch - popd > /dev/null || die - - epatch_user -} - -src_compile() { - 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 shadowstack --gcrootfinder=shadowstack '') - $(usex sandbox --sandbox '') - - ${jit_backend} - --make-jobs=$(makeopts_jobs) - - 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 - - set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}" - echo -e "\033[1m${@}\033[0m" - "${@}" || die "compile error" - - use doc && emake -C pypy/doc/ html - pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" -} - -src_test() { - # (unset) - local -x PYTHONDONTWRITEBYTECODE - - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die -} - -src_install() { - einfo "Installing PyPy ..." - insinto "/usr/$(get_libdir)/pypy" - doins -r include lib_pypy lib-python pypy-c libpypy-c.so - fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so - pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so" - dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy - dodoc README.rst - - if ! use gdbm; then - rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die - fi - if ! use sqlite; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \ - "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \ - "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die - fi - - # Install docs - use doc && dohtml -r pypy/doc/_build/html/ - - einfo "Generating caches and byte-compiling ..." - - local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c - local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" - # 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 cache - # Please keep in sync with pypy/tool/release/package.py! - "${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)" - if use gdbm; then - "${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)" - fi - if use ncurses; then - "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)" - fi - if use sqlite; then - "${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)" - fi - if use tk; then - "${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)" - fi - - # Cleanup temporary objects - find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die - find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die - - # compile the installed modules - python_optimize "${ED%/}${INSDESTTREE}" -}
