commit: be7f6ff0fc9907523a29c950f2c85148d23be364 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Nov 27 16:10:12 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=be7f6ff0
dev-python/pypy-bin: Remove old dev-python/pypy-bin/Manifest | 16 - .../pypy-bin/files/2.3-21_all_distutils_c++.patch | 321 --------------------- dev-python/pypy-bin/pypy-bin-2.4.0.ebuild | 183 ------------ dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild | 183 ------------ 4 files changed, 703 deletions(-) diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest index 81398f5..8409437 100644 --- a/dev-python/pypy-bin/Manifest +++ b/dev-python/pypy-bin/Manifest @@ -1,21 +1,5 @@ -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 pypy-bin-2.4.0-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 10238896 SHA256 158ebb6bef9e77c0ea84ade4449717a608f3e2378b18a198a15187f49f240262 SHA512 3baa4387336ee343949ff7a04de236ef6da1446efa9ae565a61abd6d5d3915d54b51d91d4958b8c1ec61d894943804ea1158c0618349fc4c9e52a8956a4afa56 WHIRLPOOL a2803b6f42a35b74761af918be7c33a460bac246fdaba3c1ca34b3dcff6bbe1f68a1a4299123ce167664516b7e29bc8450cdb6be196313657f2178259b3783a6 -DIST pypy-bin-2.4.0-amd64+bzip2+jit+ncurses.tar.xz 11771744 SHA256 4a05b8819486693c83af7cf45092926526f5511615b6d4181f72e11ac240f263 SHA512 d8e5c1c1721935fe73254fc3037176ad3c71d96acd55d8bcd15bc7b317a72261b7e08a6ae28cb62bfb2203f06b13839670b5da3e435cd87c0f65fea259be2732 WHIRLPOOL 496f244487146e1acd34981b3ec4af81590b136b884f0cb698fc35698cadfad1e278ad627563fd643294c49e1ea27f05c180dd05b3f6d2d4079527775ef4ec90 -DIST pypy-bin-2.4.0-amd64+bzip2+ncurses.tar.xz 6596304 SHA256 f2f2fa539ec1f3fd048bd81bb5fa54f260980fe9689c578f134f39ecf00aa027 SHA512 e8603ba08a11c1cbd9d3af824aca1c4ae7b61d46879b398d5d18428bc438c2e0bd0fd9ecd83f100715b635968eee3805db18a42ab62fbc10d8cd0186b6998431 WHIRLPOOL 2758fc778a1f9e5db966aa1e5a47a8da8c1fbb5882aa74ba9709c23e1b3a546c826de8ea4ba83e5baae262a51636d7201445102c97d4c749a98805a46aeac9ba -DIST pypy-bin-2.4.0-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 8596232 SHA256 3fded027e8e70fc11ec793b99ec18bde7893c54122492e5599fea59049b3a5fb SHA512 bac9647580cbee99e327d436a02c038a621aa6f4b2635b3a392218c76a0690bb9a8f3a3f79520c716cffd30a613874a1104114c287e130e2c0eadb5f3a5b05bd WHIRLPOOL 00f646d55093ea07abfe1f8ac9e354f8bb39a2dd3fe2925436583ad6209e6da0c34476b29832de4274dfe516d70db5ea6345e23532925ed09360464d4405b926 -DIST pypy-bin-2.4.0-x86+bzip2+jit+ncurses+sse2.tar.xz 9511800 SHA256 5178ce53d9da16a0d989797dd909677aaec4a8d4a936a4d27d8be1ea248489d9 SHA512 4910c72ea0b0849245657772eebfc598779f4a3eb077cec7d6e735c8aae3564ab064f9462fb0576f18792df2459d6c8f372578803497a83e4525671ffe0f8054 WHIRLPOOL 1ae421817e5f5f30ae7e9c446b4afe024de7d271a4fd8185002240e942c96dae93d45e80f6fe794dcb4a1c542a5b2ba76ab1ee81702e501de53861901ba7092b -DIST pypy-bin-2.4.0-x86+bzip2+ncurses+sse2.tar.xz 5655980 SHA256 fcfbd71b903e9c6a26cd6590090d8d0c2f8c507e9f4650f7972f36a8ef86fcc6 SHA512 45d71f2d785a65091c9f25376bcb2f7f7e02cf1f00111fcb4b0a3bf0fc5e56947be7f66f5281744de31424f9e0b7249523a4bcd5fec7bf4f3c829b66598b02af WHIRLPOOL a9fef84296f9e77062b0e0cb17537615a02f3ba7d0ed804cf63cce9baf7c1ab843b326301bde5e5a33744b716ea0efd4619e9ba55c0387acfa1622aa11b875de -DIST pypy-bin-2.4.0-x86+bzip2+ncurses.tar.xz 5634780 SHA256 2d0494fdab270c26efbe84fa42118b822b3fc021940e2d260a5c39938dcbed8d SHA512 672468e436646ed0334352addeda824ddd76a4cf1ad46231983aec7b697ae6ef2cc2b9072ae5149b4b0987b06caade65ab8bf67ca1dea10219030a9b3fd5b4b4 WHIRLPOOL 003bf4ef085b01c6625f43d34bdcfc2fa035e93373197c67540548856b160db39aed8f0a319ff3f77063dbb8abd2b6a4b412dccbab8c6a70689cf701cf98c4cc -DIST pypy-bin-2.5.1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 12366684 SHA256 14e7667b36da045c5eb6758e68d0647ba6eb9804125ad9bb9425891492012b5a SHA512 6b4abd9f8546a7e39670c8d0a00bd1f4eb5ee860eda5e6d16fc64a4b8259e8c784ac4ea567b4dad84d2ff3c72a48b07836720aaee8e608f7e7ecb2b2fcf20f89 WHIRLPOOL f2517cfd7d7d46208c8cfcdb2adcfed7c1782fd014179addc9da6842070d8d90c193bedecb20538a8330c9ae31df73fe1abf9b22727aebd0770fc3caa6e0163c -DIST pypy-bin-2.5.1-amd64+bzip2+jit+ncurses.tar.xz 14282808 SHA256 be3f365d6250a600e7494b687f41f1632774fa08938dac09cf61da1cdc331079 SHA512 41d81febca05ad6df500e1a8ff712c77ef920ae244ea48523bf637022a0a6ea07663723c284c3b2d9c7893777be4dd2266369b51c583bee9c7e42d53f4bf5c10 WHIRLPOOL 7d3719ba751f5a9b7056aa2be341823a8bacffb851f549d873ad269bc15445a7805105d201b27429247402126c2ba207bad602532372baf7053372219fbda2b2 -DIST pypy-bin-2.5.1-amd64+bzip2+ncurses.tar.xz 7298184 SHA256 4f19b38509644ebf855eabf794f89fcf83fff22d7e8b50d471a7018ce4d98f80 SHA512 45ee8a21d106b035c98bb812664b3687cfeb5eb4dfd429d84b6ee66d035692f94ca6e23ce28e68dc2c243af7008287e1cfa8f76b32b166db0af40cc206ca7168 WHIRLPOOL 7f8f86a861beb297d4081681669ae900b0fd743c76d69b695194708f192d2e00741314cd35010d71c6a7838672e223896058c34d1665777c4e4b195d74bd8474 -DIST pypy-bin-2.5.1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 9521220 SHA256 90fc72bd6333ef805bb996badc5a954fa1ecc7bb3d43ff655cba86db533ec8e7 SHA512 ece7fd6f126c8923854fdd5c05a343ec77a79a342f17588b66eb475ade9541190144d4beb7d57ab4437581109c4d74648fe941ec392bb939e325ee8f87bfd768 WHIRLPOOL 12b28e947a732bc5403a41638aa4c9167424ae70d4b620b91bfc2968daa449c03ebc8cc06e89992c4916e091987d9801b86dba9cf62a22b3a3965f547dec5602 -DIST pypy-bin-2.5.1-x86+bzip2+jit+ncurses+sse2.tar.xz 11702676 SHA256 ccd17d468a1e5a33e7f45ca542644d4ea4f24f8c070cc85264aea430c31b0f7c SHA512 70da9139476b1c0d05464b54001c276018ab70c41d2032d7b1b82a1ed88d697646f476a4589ec7b2ba1faca5a3ed751c22582939adb6f7bdcab93bc8b201d8ee WHIRLPOOL 4c816821c8c54d3762939a70718bcc0fbbd194e98b1efea25899e1dc1f31b037a798c02bb684c8d86ae1bfcb5a5f93ede3dd67c07fe6b112b1a99ced83b7999b -DIST pypy-bin-2.5.1-x86+bzip2+ncurses+sse2.tar.xz 5687144 SHA256 bcb27dbd3c6158970c705be18c162442b0b655a09af564ea12e1492559ee4f0a SHA512 524a638373079789ca97d9a5dbbe2a68e5123945d2c730408cc3b693b5182c16223b320581936b644f2e54b1b37e8f8b9f4ab6b6834483ff6462fea2572cf180 WHIRLPOOL ba73cf944180a6925ff9d429f3f6c1404e7ba24c0257ac45b7e0d449bd73c95742cc0a41901d2420ed811e62012b5a7d177c9f724fe6bee010b21ad1b7906079 -DIST pypy-bin-2.5.1-x86+bzip2+ncurses.tar.xz 5725788 SHA256 668339be67618d47aaf7a64cca6900b53b74fc23e411afed9911ef5d12401de4 SHA512 56f0a200386ee97a1d4bacab43a2b0b71a9d8aae519b9b6480a982757852ef9aa8faa53490088704398507a559af05af590e778a0284c9adfbfe151c9da556b3 WHIRLPOOL 180aa2265fb2eb9b3db86e977bcc8c09d076facf17c42de0a6eb4b0a4a753643634fa742cef37aa52e814127d5d9dfee39cc71ee844482d7cb2ee29abc1c2c33 DIST pypy-bin-2.6.0-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 12713852 SHA256 5a23efc74a73f2073d14975949b29b46f85eb815e40fe617d788bcc8463914c2 SHA512 3dbb73047365ab39f328b1c48f370015577ac68aa8ae331d2f49b89a65f2146fa9f53629c33e424ca3949e03caf1b7616c852bd65f49a635a0a3d600f1f252ae WHIRLPOOL fdb1f43231a2e0b99f9a4db6077cda172160514b8504def1f925a66521033a522710b68f7755363701639069bb8d20edfc627dc4fb8c04015b78214581c0999d DIST pypy-bin-2.6.0-amd64+bzip2+jit+ncurses.tar.xz 13707848 SHA256 f989708173de093a9d98f190b249a8ed32642fe96ace548f231457e4c743ce57 SHA512 c45cc995349f30630ae14171125bb2ddf8974a77eb817f01a0d86845050832932ca00f3d2c0fcabb15649d3b19a19cfa55d515a90e750d507828ec598aaf998e WHIRLPOOL 3e07920c7bbc9217dccbad948dd404af808c441a725c804e90b2a427fb37fbaaa08dbe12f1ad970292b301e4dd2c0014442761839290a8c7f39a3a11bf6a4019 DIST pypy-bin-2.6.0-amd64+bzip2+ncurses.tar.xz 7440860 SHA256 b86d2c6939949c16f745729082ee35ef221a48d745f98d0d9a09897187412ca9 SHA512 de9bfe9ddd342e806c59477e333c22afc672175fa3207519379c71d8d359b004a187ac0ed59211347beb562802daa05ba4e6cbb08dd8ad3587c2c9be41ed1307 WHIRLPOOL d62aec345b8a98b3ab790a2588108745c4e0203e8a76580ee700c2379b22215b141141c31d41ab211c451713aadebf05ae0f9cdd1e2b318b73e43a6f2a5ff76f diff --git a/dev-python/pypy-bin/files/2.3-21_all_distutils_c++.patch b/dev-python/pypy-bin/files/2.3-21_all_distutils_c++.patch deleted file mode 100644 index 2787360..0000000 --- a/dev-python/pypy-bin/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-bin/pypy-bin-2.4.0.ebuild b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild deleted file mode 100644 index 55e1fc2..0000000 --- a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild +++ /dev/null @@ -1,183 +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 eutils multilib pax-utils python-any-r1 versionator - -BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"; - -DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)" -HOMEPAGE="http://pypy.org/"; -SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2 - amd64? ( - jit? ( shadowstack? ( - ${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz - ) ) - jit? ( !shadowstack? ( - ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz - ) ) - !jit? ( !shadowstack? ( - ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz - ) ) - ) - x86? ( - cpu_flags_x86_sse2? ( - jit? ( shadowstack? ( - ${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz - ) ) - jit? ( !shadowstack? ( - ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz - ) ) - !jit? ( !shadowstack? ( - ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz - ) ) - ) - !cpu_flags_x86_sse2? ( - !jit? ( !shadowstack? ( - ${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz - ) ) - ) - )" - -# Supported variants -REQUIRED_USE="!jit? ( !shadowstack ) - x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )" - -LICENSE="MIT" -SLOT="0/$(get_version_component_range 1-2 ${PV})" -KEYWORDS="~amd64 ~x86" -IUSE="doc gdbm +jit shadowstack 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-5*:0 - 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="app-arch/xz-utils - doc? ( ${PYTHON_DEPS} - dev-python/sphinx ) - test? ( ${RDEPEND} )" -PDEPEND="app-admin/python-updater" - -S=${WORKDIR}/pypy-${PV}-src - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - use doc && 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" - - 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() { - # Tadaam! PyPy compiled! - mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die - mv "${WORKDIR}"/${P}*/include/*.h include/ || die - mv pypy/module/cpyext/include/*.h include/ || die - mv pypy/module/cpyext/include/numpy 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 - - # ctypes config cache - # this one we need to do with python2 too... - ./pypy-c lib_pypy/ctypes_config_cache/rebuild.py \ - || die "Failed to rebuild ctypes config cache" -} - -# Doesn't work - pypy missing its own libs -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 _curses" || die "Failed to import _curses (cffi)" - "${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 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-bin/pypy-bin-2.5.1-r1.ebuild b/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild deleted file mode 100644 index 52c2798..0000000 --- a/dev-python/pypy-bin/pypy-bin-2.5.1-r1.ebuild +++ /dev/null @@ -1,183 +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 eutils multilib pax-utils python-any-r1 versionator - -BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"; - -DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)" -HOMEPAGE="http://pypy.org/"; -SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2 - amd64? ( - jit? ( shadowstack? ( - ${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz - ) ) - jit? ( !shadowstack? ( - ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz - ) ) - !jit? ( !shadowstack? ( - ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz - ) ) - ) - x86? ( - cpu_flags_x86_sse2? ( - jit? ( shadowstack? ( - ${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz - ) ) - jit? ( !shadowstack? ( - ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz - ) ) - !jit? ( !shadowstack? ( - ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz - ) ) - ) - !cpu_flags_x86_sse2? ( - !jit? ( !shadowstack? ( - ${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz - ) ) - ) - )" - -# Supported variants -REQUIRED_USE="!jit? ( !shadowstack ) - x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )" - -LICENSE="MIT" -SLOT="0/$(get_version_component_range 1-2 ${PV})" -KEYWORDS="~amd64 ~x86" -IUSE="doc gdbm +jit shadowstack 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-5*:0 - 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="app-arch/xz-utils - doc? ( ${PYTHON_DEPS} - dev-python/sphinx ) - test? ( ${RDEPEND} )" -PDEPEND="app-admin/python-updater" - -S=${WORKDIR}/pypy-${PV}-src - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - use doc && 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" - - 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() { - # Tadaam! PyPy compiled! - mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die - mv "${WORKDIR}"/${P}*/include/*.h include/ || die - mv pypy/module/cpyext/include/*.h include/ || die - mv pypy/module/cpyext/include/numpy 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 - - # ctypes config cache - # this one we need to do with python2 too... - ./pypy-c lib_pypy/ctypes_config_cache/rebuild.py \ - || die "Failed to rebuild ctypes config cache" -} - -# Doesn't work - pypy missing its own libs -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 _curses" || die "Failed to import _curses (cffi)" - "${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 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}" -}
